summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Cocoa color dialog: Make sure hide() exits the modal sessionGabriel de Dietrich2013-07-101-1/+8
| | | | | Change-Id: I708011f3a8ce507e6ade98bf99ad0f5d7b160751 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* QListWidget - iterator fix in QListModel::ensureSortedThorbjørn Martsum2013-07-091-0/+4
| | | | | | | This is a fix similar to 7ddf1b14ecc7e56ddcc78cc7057881d7925d20ff Change-Id: I369f428252527a8c3326c0f23a1dc31b63f884f5 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Rename a few QSignalSpy variables to match what they are spyingTor Arne Vestbø2013-07-081-15/+15
| | | | | | | Makes for more informative debug output when the tests fail. Change-Id: Ib07dd79452a56413c711394dd72aa37dbb4a70d7 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* QUrl: add RemoveFilename to UrlFormattingOptions.David Faure2013-07-083-13/+31
| | | | | | | | This allows to find the parent directory url using url.adjusted(QUrl::RemoveFilename). Change-Id: I1ca433ac67e4f93080de54a9b7ab2e538509ed04 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QUrl: add "QUrl adjusted(options)" convenience method.David Faure2013-07-083-9/+65
| | | | | Change-Id: I5eea3e0dc7b56b88a56d813207b04661b8f05a55 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix QUrl::topLevelDomain(QUrl::FullyDecoded)David Faure2013-07-064-9/+12
| | | | | | | | | qt_ACE_do(".co.uk") was returning an empty string because of the leading dot. Allow leading dots from topLevelDomain, but not from other calls. Change-Id: I757d9960708e205d30554cd2bbcf618c8624792b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add API to let applications integrate with the system fontsAleix Pol2013-07-057-12/+115
| | | | | | | | | | | | | | | | | | This patch does 2 things mainly: - Adds a QPlatformTheme font type for fixed fonts. It's important because some OS provide specific monospaced fonts and we want to let our applications to use the preferred fonts by default. - Adds a new method and enum to QFontDatabase that expose the font types that applications might need, so that they can make the applications use the specific fonts that the system recommends. This data was already available within Qt through the QPlatformTheme, but it was not possible to use this data by Qt users. This new method exposes such data. Change-Id: Ic194c1e4bc07a70640672afd82ba756b87606985 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: David Faure (KDE) <faure@kde.org>
* Key mappings for more remote-control keysAllan Sandfeld Jensen2013-07-055-0/+48
| | | | | | | | | | | | We are missing a few key mappings to have support for remote control keys supported by Android and DirectFB. This patch adds the four color keys Red/Green/Yellow/Blue and ChannelUp and ChannelDown. Change-Id: I4d859c28e0d61c5362f1212ba1e577a47de86ec1 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* xcb XI2: simplify and generalize tablet detectionShawn Rutledge2013-07-053-99/+74
| | | | | | | | | | We're looking for any tablet which has appropriate valuators, not just Wacom tablets that have recognizable names. The name recognition was always brittle and already stopped working, probably because of changed udev rules or something like that. Change-Id: Ib3a6dfdd9972b16f08f270e3f0a1aa54d6660c9f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QColorDialog: don't create widgets if the platform dialog will be usedShawn Rutledge2013-07-053-26/+47
| | | | | | | | | | | It will save memory and also prevent bugs where it's assumed that if the widgets exist, they should be painted, maintained and/or used as a current value store. Task-number: QTBUG-31998 Change-Id: I04e3b016018221a405dd7da1fd455e0ede2233fd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* QTableView::sizeHintForRow minor fix of word wrap in a special caseThorbjørn Martsum2013-07-041-1/+10
| | | | | | | | | In case we do a resizeSection to 0 (can also happen by a reset) then the auto resize won't work with word wrap. The first resize afterwards it will only resize to a single line. Change-Id: I3abf779ecb0593b6721f5af16f7a39d05004e98f Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QTableView::sizeHintForRow move word wrap into heightHintForIndexThorbjørn Martsum2013-07-042-15/+8
| | | | | | | | | | | | In 03c761287f1a007c7177d90ed81341d0147eae05 it was overlooked that word wrap handling (with advantage) could be moved into the function, too. This patch makes the code more readable, but does not change anything. Change-Id: Ifed349398b862650da383e4e6fd337a166dc680e Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Implement system locale for AndroidEskil Abrahamsen Blomfeldt2013-07-046-3/+257
| | | | | | | | | | | | | On Android, we would default to C locale always. We need a connection to Java in order to get the locale, so this has to be done in the platform plugin rather than the QtCore library. It's enough to instantiate the QSystemLocale subclass, since this will automatically register itself as the current system locale. Task-number: QTBUG-31651 Change-Id: I76f3e30f7dff90e8101cb560cee2b96c9300d9af Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Make sure libgnustl_shared.so is deployed along with Qt libsEskil Abrahamsen Blomfeldt2013-07-041-0/+1
| | | | | | | | | | Since configure no longer puts this in $QTDIR/lib, we need to copy it from the NDK and into the device ourselves. Task-number: QTBUG-32079 Change-Id: I75ee5f8a00de9a1ba536bcfd857e6b2e7a0e1f6e Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Make sure activity is closedEskil Abrahamsen Blomfeldt2013-07-041-0/+1
| | | | | | | | | If we don't call finish() before crashing the activity, then the Activity Manager will just restart it. Task-number: QTBUG-32079 Change-Id: I09623afe545c3f4e8b9be801ccfbe244059b270e Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Make sure main application library is loadedEskil Abrahamsen Blomfeldt2013-07-041-0/+1
| | | | | | | | We need to also load the binary for the application itself. Task-number: QTBUG-32079 Change-Id: Ic26d5e6d950d6d18aaa54392c3c84b6deaa56c75 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Update native functions to match signature in platform pluginEskil Abrahamsen Blomfeldt2013-07-041-4/+9
| | | | | | | | | We just pass 1.0 as the scaled density for now, since it shouldn't make much different to the code being tested. Task-number: QTBUG-32079 Change-Id: I888c4640e4627f47a2c128d2ce2a41adf4ca3132 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Add WACOM tablet support for Windows.Friedemann Kleint2013-07-045-5/+653
| | | | | | | | Task-number: QTBUG-30008 Change-Id: I3327baecae7c5d1411bcd125411097f36460cde5 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* XCB: Fix warning about unhandled enumeration values.Friedemann Kleint2013-07-041-0/+2
| | | | | | | Introduced by 438211ec627073817fcaf6d3a07b76f2aa5d90e0 . Change-Id: Ia6765c2a49f13958c70f83ebf79fdaadfdd25ac9 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Add Q_OS_OSX and update the documentation to reflect usage intent.Jake Petroules2013-07-042-9/+12
| | | | | | Change-Id: I7f089109d7357995b65f6a012f705a6c3cac12ff Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Xcode: Fix defines in OTHER_C/CPLUSPLUSFLAGS for project file outputTor Arne Vestbø2013-07-032-5/+11
| | | | | | | We were only fixing QMAKE_C/CXXFLAGS, not the defines we then appended. Change-Id: Iaa4a394738658c45aae83941ebe54470d6d8e250 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Xcode: Fix string quoting to match ASCII plist formatTor Arne Vestbø2013-07-031-20/+60
| | | | | | | | | | | | | | | The logic for quoting and unescaping strings was a bit random. We now leave the strings alone, until writing them out as values, where we quote and escape the characters that need escaping. See: http://www.gnustep.org/resources/documentation/Developer/Base/Reference/NSPropertyList.html https://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/PropertyLists/OldStylePlists/OldStylePLists.html https://code.google.com/p/plist/source/browse/trunk/src/main/java/com/dd/plist/NSString.java?r=107#230 Change-Id: I2096df531947abdce4f6b57428136f544d22c466 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QStyle - tooltip - add wakeDelay and sleepDelay as styleHintsThorbjørn Martsum2013-07-035-6/+80
| | | | | | | | | | | | | | In earlier patches we allowed the user to control the tooltip duration. However the user still couldn't control the wake delay and sleep delay. This patch changes that and is the final patch in solving: Task-number: QTBUG-1016 Change-Id: I5e2c719737634ad7f371ad03691744612472ae70 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Add a way to test if an OpenGL context has the fixed function pipeline availableGiuseppe D'Angelo2013-07-022-1/+10
| | | | | | | | Due to the mess done in 3.0/3.1 this is trickier than it should be, so add a convenience method to test that. Change-Id: I26d77cc8f109820cca3f578c3fa3520e802dc15f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix documentation of the QOpenGLFunctions::OpenGLFeature enumGiuseppe D'Angelo2013-07-021-2/+2
| | | | | | | | | | | | It's not really about features already present in OpenGL ES 2 that might not be present in other OpenGL implementations; for instance, NPOT textures are not in ES 2, but only available through extensions. Therefore, change the wording to include optional OpenGL and OpenGL ES features. Change-Id: I3822e50789ded10a937e3c5b7b4be9e267265276 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* macx-xcode: Use correct replacement key for bundle identifierTor Arne Vestbø2013-07-021-1/+1
| | | | | | | | | The 'BUNDLEIDENTIFIER' key ensures that we generate an rfc1034 compatible identifier. Change-Id: Ic5cefb8ae888d768dd793813e7ee3c23c9a5582a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Revert "Fix QUrl::topLevelDomain(QUrl::FullyDecoded)"Thiago Macieira2013-07-022-4/+2
| | | | | | | | | | This reverts commit e3fa266623b08e837cb4ccc7fe59da243d03dd27 That commit applied a change at the wrong place in the code. Change-Id: I21e3045a3af14ad2f90c5fe338815c35a2d27ae6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: David Faure (KDE) <faure@kde.org>
* QNX: Fix invalid screen size when attaching a second displayFabian Bumberger2013-07-021-0/+6
| | | | | | | | | | | | When attaching a display several SCREEN_EVENT_DISPLAY events might be received. SCREEN_PROPERTY_SIZE might not be populated in the first event we get, so we wait. Change-Id: I357108bb347eb92cd773d293bfe7cd462fb7e527 Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Petr Nejedlý <pnejedly@blackberry.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Let qdbusxml2cpp generate code that compiles: no '-' in variable names.David Faure2013-07-012-1/+5
| | | | | | | | org.freedesktop.Application.xml has <arg type='a{sv}' name='platform-data' direction='in'/> Change-Id: I035436d48ec45da3ccad7dabe01e9cccec17b730 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QDBus: improve error handling, to give the developer feedback.David Faure2013-07-016-28/+43
| | | | | | | | | | | | | For instance, exporting an object with a slot like QString complexMethod(const MyVariantMap& vars); (even with a simple typedef QVariantMap MyVariantMap) used to silently skip that method in the introspection. Now it outputs: generateInterfaceXml: Skipped method "complexMethod" : Invalid type in parameter list: MyVariantMap Change-Id: I7964cfb63e973257ce1abe47b9625e361b2ad23f Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix QUrl::topLevelDomain(QUrl::FullyDecoded)David Faure2013-07-012-2/+4
| | | | | | | | | qt_ACE_do(".co.uk") was returning an empty string because of the leading dot. This has always caused issues in KDE code too, where ACE normalization needs the dot removed, and re-added afterwards. Change-Id: Id9fcea0333cf55c14d755a86d4bf33a50f194429 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Add the same flags for the c++ compiler as they are already defined for the ↵Wolfgang Bremer2013-07-011-0/+1
| | | | | | | | | c compiler Change-Id: If3d42a6b3ad361c8a11b4eee8dd17be0e58d9192 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* QNetworkConfiguration: add public member bearerTypeFamily()Peter Hartmann2013-06-283-3/+95
| | | | | | | | | | | ... to let the user know whether he is on e.g. Wifi, 2G, 3G or 4G. In most cases, this is what the user wants to know anyhow, while e.g. BearerEVDO or BearerCDMA2000 go into too much detail. Task-number: QTBUG-31828 Change-Id: I244a4473feb40e106cbc08e09afdee07d4ecc8d7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-06-2889-418/+763
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-2789-418/+763
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/features/create_cmake.prf Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5
| | * Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-06-2719-154/+223
| | |\ | | | | | | | | | | | | refs/staging/stable
| | | * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-2519-154/+223
| | | |\ | | | | | | | | | | | | | | | Change-Id: I4c0ae2ac1c10d4d50c03625c802d981b7850ed6f
| | | | * install qconfig.h into framework bundlesOswald Buddenhagen2013-06-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-31969 Change-Id: I5ade18352a9989bdfd513c51c021d475f39aa7c6 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | | | * fix bundled header creation for debug buildsOswald Buddenhagen2013-06-251-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the only case where we want to skip copying the bundled data (which is an optimization only) is the debug sub-build when we are actually building both debug and release. Change-Id: I1f3f67ccd9a64033b133ffaf58639cd9f7107c27 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | | | * disable non-framework header install also for debug buildsOswald Buddenhagen2013-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i see no particular reason why debug builds should still get "normal" headers. Change-Id: I3625648549e8c234a365bab26823190ed2219cdf Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | | | * install private headers into frameworksOswald Buddenhagen2013-06-252-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-31641 Change-Id: Ifadc380c0a8983b2be93194e2e2257494b13dff8 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | | | * don't needlessly do QMAKE_BUNDLE_DATA+=FRAMEWORK_HEADERSOswald Buddenhagen2013-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there is no point in adding a structure we don't actually define. Change-Id: Ica43123f17eca6ebd4b5b7ec2526ebabef31c82a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | | | * un-nest conditionalsOswald Buddenhagen2013-06-251-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's cleaner, and it makes it possible to actually have a single else branch. Change-Id: I5ef917b678e2bd5a2face8ee19e942e5e952aa80 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | | | * mac framework build: always set QMAKE_FRAMEWORKPATHOswald Buddenhagen2013-06-251-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't mess with the -F linker flag manually. qt headers include other headers via the canonical Module/Header syntax, which means that the compiler also needs the -F flag. QMAKE_FRAMEWORKPATH does exactly that. Task-number: QTBUG-29003 Change-Id: I5f4af1a462697cd6996c54436ccdb9fc2b216020 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | | | * Update for the newest Darwin-family operating systems.Jake Petroules2013-06-253-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib90296e35f8aa8d63692cf03ba9ffcb94a1a7687 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| | | | * Fixed testbuild with QT_NO_CURSORBjoern Breitmeyer2013-06-251-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the QCursor entry from the list of types if QT_NO_CURSOR is set. Change-Id: I6b8e925acedec75ed6e46b2e3fe34d0011667c91 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| | | | * Fix QDir::mkpath failing for drive paths on WindowsKai Koehne2013-06-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression introduced in 3e2cd8ef6f1ce4f467. We shouldn't try to call mkdir for just a drive letter. Task-number: QTBUG-31862 Change-Id: I56035857aec03f9f1cceef62e82f372486b7737b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| | | | * Mac: Ensure that C++11 is always used when linking against a static Qt buildTor Arne Vestbø2013-06-241-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If Qt was built with C++11, it links to libc++, and we need all projects that use Qt to link against the same library. Technically, we could do QMAKE_LFLAGS += -stdlib=libc++, but that hasn't been tested enough without also enabling C++11, so we keep the relationship between the two for now. Change-Id: Ic628bcbade60cc82f93707f372c2119c24d9dc8a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
| | | | * Use BSD licensing for QtOpenGLExtensions instead of LGPLJonathan Liu2013-06-244-104/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BSD licensing should be used for QtOpenGLExtensions instead of LGPL as it is a static library that is linked into applications. Using LGPL would impose additional requirements for application developers to provide object files to end users to be able to relink the application with a modified or updated QtOpenGLExtensions static library. Task-number: QTBUG-29918 Change-Id: I0bb80f8ba5158be0a71fe4c5e1c37787ce21337d Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | | | * Widgets: Set qt_button_down for each press.Friedemann Kleint2013-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not rely on release events. Task-number: QTBUG-31333 Change-Id: I09a056fed8892715c04ca78a42ae191e5a9a3b42 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 14:00:19 +0000