summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Update Irish locale to return correct date formatEl Mehdi Fekari2013-03-133-3/+35
| | | | | Change-Id: I89ad9b97dba6f76d34a23ec03b119fb51e592917 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fixed QTreeWidgetIterator to work with sorted QTreeWidgetJan Arve Saether2013-03-132-5/+31
| | | | | | | | | | | | | We cannot access children directly, since that won't ensure that the pending sort is executed. However, the functions we need are there already and actually makes the code nicer. Task-number: QTBUG-29903 Change-Id: I6899284275dd79b991896a5f08486b58d95f819d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> (cherry picked from qtbase/aa2d10750ad8cdb6a86d519063664c2924b2a635) Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Workaround a bug in mktime on QNXFabian Bumberger2013-03-131-0/+10
| | | | | | | | | | | | | Under certain circumstances, mktime failes to convert the tm struct into secs since epoch. This is a workaround and fixes the qdatetime and qqmllocale autotests. Backport of: 56820382f26 Change-Id: I7d819aad2d6901cd096b441f2c18fd97108d9abb Reviewed-by: Mehdi Fekari <mfekari@rim.com> Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Updated WebKit to 5fc7dcbe084a8ee8beda11b92dc2111be1285434Simon Hausmann2013-03-135-3/+38
| | | | | | | | | This brings in a fix for QTBUG-30081 as well as a backport of https://bugs.webkit.org/show_bug.cgi?id=103529 Change-Id: Ibcebe76d6999dc304d4c0323bbfa44be93909285 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* List supported file formats in search indexing.Leonard Lee2013-03-131-0/+3
| | | | | | | | | | | The supported file formats is implemented in QHelpSearchIndexWriter::indexableFiles() function. Task-number: QTBUG-30110 Change-Id: I3a0885f4c85ec7e14c5f0d4edbb33a463f657b54 (cherry picked from commit qttools/24f92f79e5d1198e79f4d46489af35999e8e74cf) Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix warnings in tests (CLANG).Friedemann Kleint2013-03-113-4/+3
| | | | | | | | | - Statement has no effect - Adding int to string - Unspecified behavior when comparing character literals. Change-Id: Ie9cb9a1036b5cf5c62890685c60dee4af1ce7148 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Add WindowStateChanged eventRafael Roquetto2013-03-065-0/+37
| | | | | | | | | | Not currently considering activation state. backport from qt5 8dc2f81c9f0e6eb8cab09e5d682358fd140b49b8 Change-Id: Ib46e554b08cc8d15f83e9865a8f0be3f8d7b9d16 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix moving widgets in horizontal layouts in RTL mode.Friedemann Kleint2013-03-061-1/+4
| | | | | | | | Task-number: QTBUG-25872 Change-Id: Ia311b88f0ed3450d798bc5a9136e978c642d5b25 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> (cherry picked from qttools/eb456f72052b02a77e22868bfa55a25d7af3e660)
* BlackBerry: handle window state navigator eventsRafael Roquetto2013-03-056-7/+75
| | | | | | | | backport of qt5 439002cddeb32766ea9806ac8b5cf9a973ed0f13 Change-Id: I2431ebd1240ba6f3c2b690b311301d222ec10865 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Active X plugin: Fix setting a control by task menu.Friedemann Kleint2013-03-051-2/+3
| | | | | | | | | | | | | | The property is a QString when set by the menu or a PropertySheetStringValue when loading the form. Breakage introduced by 8695c1753964eeb06b5d9306010b56be5fc151c0 . Task-number: QTBUG-29234 Change-Id: I84c3de80b99c8a20aaf1f8f7289882b0092d6a0a Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from qttools/3e43b158ce158dc1285593d2c7555351033fc3ce)
* QSslConfiguration: toggle on demand loading of root certs properlyPeter Hartmann2013-03-046-6/+90
| | | | | | | | | | | | | | | | | make sure we keep track of when we can load root certs and when we cannot (we cannot when the developer set the certs explicitly). This is implemented the same way for QSslSocket already, and needs to be duplicated because we have 2 methods for setting CA certificates: one in QSslSocket and one in QSslConfiguration. In addition, adapt the auto test which checks whether setting a default QSslConfiguration works: There is no way to set on demand loading through the API, so it should be enabled by default. Task-number: QTBUG-29103 (backport of commit ce35c0db0d9dd849c736eabaeb57d597186aaa13) Change-Id: Idf15c21092c7727e1080b1c261ce055f30dbcf63 Reviewed-by: Richard J. Moore <rich@kde.org>
* unmess CONFIG/QT_CONFIG static/sharedOswald Buddenhagen2013-03-012-4/+9
| | | | | | | | | | | | | | | bring it to the state of 5.0.2: both QT_CONFIG and CONFIG in qconfig.pri contain the respective flag, so it is a) visible how qt was built and b) user code has a consistent default. before, on windows we had it only in qconfig.pri's CONFIG (so it was harder to find the qt config), and on unix we had it only in .qmake.cache's CONFIG (so it was impossible to find the qt config in a clean way, and there was no default (other than some arbitrary mess inside qmake itself)). Change-Id: Iad06de8c4435cec3e1407babde037ac96cb5bf66 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* define NDEBUG in MSVC/nmake release buildsJoerg Bornemann2013-03-011-0/+5
| | | | | | | | | | | Some headers, like assert.h, check for the presence of NDEBUG. We already define NDEBUG for MSVC/vcproj release builds. Task-number: QTBUG-3389 Change-Id: I3b1510d47ff80611aa8072e66492ff2d648393eb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit ebc4fb452ac268657023cb957c1b0ca0e315b9fc)
* Fix generation of XCode projects for XCode 4.6Andy Shaw2013-03-011-3/+5
| | | | | | | | | | | | When a framework is referenced in the XCode project then it is known as a framework by the lastKnownFileType and not the reference type. This ensures it works in both XCode 3 and XCode 4. Task-number: QTBUG-29371 Change-Id: I434246a46d6c5bfd50ba7de1a7c710c0caf0bc0a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> (cherry picked from qtbase/4a6a066df2f104763c35eaaaf8dc7b1366d483b2)
* Introduce compileTest function.Oswald Buddenhagen2013-03-012-103/+116
| | | | | | | | | | | | This avoids the enormous duplication of identical command line arguments passed down to compile.test. This necessitates the addition of a -config parameter to compile.test, as QMAKE_CONFIG needs to be extended in some cases. Backport of qtbase commit ca4823505bee3674a8d65cd1bdd45ea93546114b. Change-Id: I22aa0336443d330e49e674e5484f08c43c913d31 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix CreateFileMapping() error handlingPeter Kümmel2013-03-012-4/+5
| | | | | | | | | | | CreateFileMapping() returns NULL in case of an error. The patch corrects the wrong testing on INVALID_HANDLE_VALUE, and sets NULL for invalid handles. Change-Id: Iaab4945ed88ee92bbf9a0871e95a5820dd1a56ed (cherry-picked from qtbase/1a8f67938c4146614fec3788c7868dc1a314cc84) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add support for SQLSTATE error codesAndras Mantia2013-02-281-12/+18
| | | | | | | | | | | | | | | Postgres can report detailed information about an error using error codes. See http://www.postgresql.org/docs/8.1/static/errcodes-appendix.html . The current driver doesn't report the error, nor is it supported by the QSqlError object. The patch appends the error to the error message, helping applications to: - handle different errors in a specific way - show correct, translated error messages, independently on the language of the postgres installation Change-Id: I5c7792606307afdefaeae37c512949c85c2c7674 Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry picked from commit qtbase/8ccab9b029ed2a2444d89a9cfc6c4a1866b8e82d) Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Fix QTBUG-18934 by checking return value of qt_safe_pipeSimeon Bird2013-02-281-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | When QProcess->start() is called, Qt creates a pipe to the process to get its exit value and output. It does this with qt_create_pipe, which calls qt_safe_pipe. qt_safe_pipe, on failure, returns 1. qt_create_pipe then sets errno and returns void. The calling function, QProcessPrivate::startProcess, does not check errno, and thus continues to fork the process, assuming the pipe has been created successfully. The child process then has no way to pass its exit value to the calling process, since the communication pipes it would normally use do not exist, and thus when it exits it becomes a zombie. As a bonus, if waitForFinished is called on a broken process, a crash results because it is trying to wait on a pipe which does not exist. The fix makes qt_create_pipe return an integer, and QProcess::startProcess check the return value, set processError and not create the child process. Task-Number: QTBUG-18934 Cherry-picked from qtbase f575dc214630b3e3ebd66477a623c78405724468 Change-Id: I2e1effdd0617be5b8c5492bcbcf5f2b1584b2241 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* SSL docs: Be more explicit about the threats of ignoring SSL errorsPeter Hartmann2013-02-272-5/+14
| | | | | | | | | ... because almost everybody gets it wrong almost every time. (cherry picked from commit eaa18f306341818165c2ee4fc22750da04d5e45e) Change-Id: I3ca1dfe9723d4d29339c2c0a1ebe421f5929c760 Reviewed-by: Richard J. Moore <rich@kde.org>
* Fix compilation of Qt Concurrent with gcc 4.3Thiago Macieira2013-02-271-1/+1
| | | | | | | | | | | | GCC 4.3 had support for decltype but not the new function syntax (which we call "auto function" for short). That meant the code did not compile. qtconcurrentrun.h:105: error: expected initializer before ‘->’ token Task-number: QTBUG-28984 Change-Id: I792276ec59c4f6e73f6137c517636e70c71ed849 (cherry-picked from Qt 5 commit 0c4f6c6ea9415bcc5fde3e34bf909f43a9c6483c) Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix DB2 driver X64 Linux BuildKarim Pinter2013-02-241-1/+1
| | | | | | | | | | On X64 Linux DB2 driver build give an error on BIGINT conversion to QVariant, casting it to qint64 solved the problem. Task-number: QTBUG-20172 Change-Id: Id11b8a4b1f4ed3d5ed9854dfb53526d401b7d97d (cherry picked from qtbase/c8e34ed678145f2e5709d39007e27e186d1bc1f9) Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Fix Mac OS X SDK checks for non-default Xcode setup.Danny Boelens2013-02-221-3/+3
| | | | | | | | | | Don't assume Xcode is installed in /Developer; it can be installed in a custom location. These checks don't exist in Qt 5 any more. Change-Id: I03ab68bb55b8e89694510a044404d29e480b0c5b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QPdfEnginePrivate: Fix invalid format for rectangles on some localesDmitry Shachnev2013-02-221-6/+10
| | | | | | | | | | | This is done by using locale-independent QByteArray::setNum() instead of qvsnprintf() for printing doubles. Cherry-picked from qtbase c9ae652487514acd19f3631224ced7ac14f756c8. Task-number: QTBUG-24949 Change-Id: Id0a6e9ad6a45d7e17dfcffd625891d68c00d516c Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Flickable shouldn't grab the mouse until it starts an effective move.Andrew den Exter2013-02-224-28/+134
| | | | | | | | | | | | If the boundBehavior prevents the flickable from moving its content item in response to a drag it shouldn't grab the mouse as that will prevent a parent MouseArea or Flickable from handling the drag. (cherry picked from commit e8ca72d484c0e56f030e4742bb5f92b6f0555146) Task-number: QTBUG-29718 Change-Id: Ief82ef7b898ea2581fd0b7e52548f451d887e2f1 Reviewed-by: Alan Alpert <aalpert@rim.com>
* MouseArea shouldn't grab the mouse until there is an effective drag.Andrew den Exter2013-02-223-22/+136
| | | | | | | | | | | | A MouseArea shouldn't prevent a parent MouseArea or Flickable from handling a drag event unless it is going to do something useful with it. (cherry picked from commit 67db779665b1d95a20720c0dee058c47f7df8726) Task-number: QTBUG-29717 Change-Id: I17caa51ebc2e547e73e727fd185e60644591ad2b Reviewed-by: Alan Alpert <aalpert@rim.com>
* Fix multiselection by CTRL-click in QFileDialog/KDE.Friedemann Kleint2013-02-211-1/+5
| | | | | | | | | Task-number: QTBUG-29257 Change-Id: Idfac80e855455a4537dd38a23136762cd9398e15 Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> (cherry picked from qtbase/b6ccdfa4823d4608f5cb94797b48fc82b8833581)
* Fix path separators in archives created by QZipWriterPavel Mogilevskiy2013-02-211-6/+6
| | | | | | | | | | | | | | | | It was not possible to extract data from the archive on OSX which was created on the Windows platform because of wrong separators. Archive was created on Windows via QZipWriter and opened on OSX with QZipReader. It consisted of a lots directories and subdirectories with files. The solution is to use '/' separator for internal representation. Cherry picked from qtbase eff6dbb306956f099374e5a0c5942b9e91a81e71 Change-Id: I2180282d235dc998309fc4f7b67f5c0181b78dda Reviewed-by: Vasiliy Sorokin <sorokin.vasiliy@gmail.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix text issue with Hiragana characters when stylesheet is applied.Mitch Curtis2013-02-212-0/+12
| | | | | | | | | | | | | | | | | | | When typing into a QTextEdit or QLineEdit with a Japanese IME on Windows, some characters have both a black foreground and background and hence cannot be seen. This patch fixes the issue by setting the appropriate colors for the text in these scenarios. The change also fixes a similar situation with QSyntaxHighlighter and Hiragana, where the background and foreground colors were the same. Now it will use underlining to highlight the text (like WordPad does, for example). Task-number: QTBUG-29442 Change-Id: I364d327a8f6573a73b227b79cc5f570cd02611c9 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: David Faure (KDE) <faure@kde.org> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Take fontconfig font width into accountBernd Weimer2013-02-211-5/+18
| | | | | | | | | | For fonts provided by fontconfig the FC_WIDTH will be mapped to QFont::Stretch to achieve a more accurate font matching. In Qt5 the font style is considered instead. This cannot be used without breaking binary compatibility. Change-Id: Ia519c2b70eb9f03ba0971fd6e8dd575169c7b72a Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
* QStackedLayout: Fix crash when focus widget is destroyed in hide()Jan Arve Saether2013-02-202-12/+104
| | | | | | | | | | | We also have to make sure that when moving back to a page that has a focusWidget(), the focus should go to the focusWidget() Task-number: QTBUG-18242 Change-Id: Ibfa7d6361c1a456480b2f1584a88ef4c4f405709 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (cherry picked from qtbase/18f9eb797bffe8626f1edeca3c88f80dae0da8d7)
* Clean whitespaceJan Arve Saether2013-02-201-5/+5
| | | | | | Change-Id: Iec1950a0f4053cd71633162f0cb50efc9d4d493f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (cherry picked from qtbase/64106705e7ca6132b1de15529c6206ebb0c58dfa)
* Fix QDeclarativeListView currentSection property updateNils Jeisecke2013-02-202-0/+33
| | | | | | | | | | | | Model modifications that did not trigger the refill logic caused the view's currentSection property to contain an outdated value. A new autotest has been added to catch the bug. Task-number: QTBUG-29712 Change-Id: I88cf1295ac55dad7596b6ba1fe475ebf98a31026 Reviewed-by: Alan Alpert <aalpert@rim.com> (cherry picked from qtquick1/d31f965b72a1bb8aba0b846471780e90fcc895ba)
* update ofono APILorn Potter2013-02-202-21/+71
| | | | | | | back ported from sha 539a024819a5f696b8afe899108b409f2b77549c Change-Id: I3b4eac82c8d16076dc1987780512dcd93925e0b4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* fix connman bearer for new API.Lorn Potter2013-02-202-6/+65
| | | | | | | | back ported from qt5 sha 2efccfeeef70ebd8a2db2ebccb3c63722ae76e1f Change-Id: Ib9cdbb6e4bdfed8420cdc2364503445924c8c57c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fixed some issues in QFontconfigDatabase::fallbacksForFamilyBernd Weimer2013-02-191-3/+4
| | | | | | | | | | In FcFontSort() the result parameter is not set in older fontconfig versions (<=2.9.0), so this parameter is ignored. Some fontconfig objects are destroyed after usage to avoid memory leaks. This is basically a backport from Qt5. Change-Id: I557dbd5d7303cbd98becf169ebaa754e5d99c281 Reviewed-by: Wolfgang Bremer <wbremer@rim.com> Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
* QThread documentation: do not discourage the reimplementation of QThreadSze Howe Koh2013-02-193-65/+83
| | | | | | | | | | | | | | | | | | | | | The new QThread documentation now really discourage to reimplement QThread. But in fact, there are many cases where it is perfectly fine. And the example given is even a case where using worker object is wrong. The examle even contains a leak since the thread will never stop and will even leak. This changes put back some sentences from before commit 207f588b6896cbe72745037dc1cb0a3aef1cf6d0. The sample code has been re-writen. Notice how reimpementing run takes less lines of code, less runtime overhead, no leaks, and also is more complete than the previous example. This is a modified backport of qtbase commit 91e12dca757a8ef5c4691b70eb80db61a9d47e83 Change-Id: I4932aef00307a6cf91d57d632a02b8a85e5e8845 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Add a method that allows registration of files to typesAlan Alpert2013-02-197-1/+145
| | | | | | | | | | | | | | | There is currently no way in C++ to duplicate the functionality of a qmldir file in mapping QML files to versioned types in a module. This functionality would be useful both in cases where a separate qmldir file would be overkill, and for cases where the type mapping should be generated dynamically. Since public API is frozen for 4.8, this is being added as private API for those who need some measure of compatibility with qtquick1 in Qt5. Change-Id: I28d7898122c5556fcd7cf3476795bcf4bb288ea6 Manual cherry pick of qtquick1/9995a2910d8a5f0317fe3adeb54f838b99ab31a8 Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* qpa: Fix crash when requesting QApplication::platformNativeInterface()Julien Brianceau2013-02-191-1/+1
| | | | | | | | | | | | If QApplication has not been instantiated, this function would crash. Change it to return NULL pointer instead. cherry-picked from qt5/qtbase 3ee48926e6584b4afeda1fc406d19d7b1a8d6f20 original patch from Miikka Heikkinen <miikka.heikkinen@digia.com> Change-Id: Ic9aae241f9c424fb371ae1774da6a3cb28c31883 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
* Add missing Objective-C namespace prefixesHalewijn Geerts2013-02-191-2/+2
| | | | | Change-Id: I5d62fcf0880776e290ae739ece81b685bb7af194 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Ensure the native filedialog starts up with the right directoryAndy Shaw2013-02-181-0/+2
| | | | | | | | | | | | On Mac it was not starting the dialog with the specified directory when one was present. If a filename was given as well then it would start up fine. Task-number: QTBUG-28161 Change-Id: I7cce0d065dd57e6433ce62380d4263d6e20b6e7c Reviewed-by: Liang Qi <liang.qi@digia.com> (cherry picked from commit d75d86190bca85841db2040d50184f4c6886ef89) Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Fix call to QMetaObject::metaCall from updatePropertyDavid E. Narváez2013-02-181-2/+5
| | | | | | | | | | | Create an array of arguments in the same way QMetaObject::write does cherry-picked from f0221d359499f675115da1f47dd3669a4383653d Task-Number: QTBUG-29082 Change-Id: Ia2772bce409876861b7004320641b0c4e8996fa8 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QLocale: Update tamil's AM/PM textEl Mehdi Fekari2013-02-153-108/+128
| | | | | | Change-Id: I355d24fcaaf2c76b8bdbc51f71f931118f5cb3cd Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Ensure that pixels is only freed if there was no CGImage for itAndy Shaw2013-02-131-1/+1
| | | | | | | | | If there was a CGImage that was using the same pixel data then when it is released it will also free the pixel data. So don't release it a second time in that case. Change-Id: I7d0f3fcbaeb137328acc71783be4e4cee33ce001 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Doc: Edited Qt Help page and clarified .qhp file location.Jerome Pasion2013-02-131-15/+17
| | | | | | | | | | -replaced "html" with "HTML" -noted that the .qhp files are in the HTML directories Task-number: QTBUG-29576 Change-Id: I6c6925465ae370d6796657057eb3c4bf7bf5ab47 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
* Fixed checking HOME variable return value using isEmpty()Pasi Petäjäjärvi2013-02-132-1/+9
| | | | | | | | | | | | Return value of the QFile::decodeName(qgetenv("HOME")); is never null if HOME environment variable is not set. So need to check the return value using isEmpty() instead. Task-number: QTBUG-28912 Change-Id: I7875520965bf2c0c7311fb051c1f5177e9c3685b (cherry picked from qtbase/05b4000e01ff5785739617c3069fbe0b0d36a606) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Create default install prefix location for QtEmbedded with VxWorksPasi Petäjäjärvi2013-02-131-1/+11
| | | | | | | | | | VxWorks has two different targets (modes) for which Qt can be build. DKM mode is static build and RTP is using shared libraries. Distinguish these two if we are creating default install prefix. Not applicable to Qt5 as it does not anymore make separation for QtEmbedded build. Change-Id: Icaff82a1d3078e8882ae5dbe9b2e60bc4a419b66 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Strip prepending <hostname>: string from currentPath() for VxSimPasi Petäjäjärvi2013-02-131-1/+9
| | | | | | | | | | | VxWorks simulator (VxSim) maps SDK rootdir usable as normal directory. Mapped directory name is either host: or <hostname>: and can be used without prepending prefix containing colon. Strip prepending string and colon to get valid native path to host SDK rootdir running VxSim. Change-Id: I15f4bf4d9eb2cea87268bad9b1a95973962cb2c8 (cherry picked from qtbase/cd5a4279f38ac6cca8ff8da4d75c2577d9b0bbcd) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Cocoa: Do not use NSOpenGLPFAAccelerated flag for GL contextJonathan Liu2013-02-121-3/+0
| | | | | | | | | | | | The NSOpenGLPFAAccelerated flag indicates that only hardware-accelerated renderers are considered. It is used when direct rendering is enabled in QGLFormat. As direct rendering is enabled by default in QGLFormat, this prevents software rendering fallback if no hardware acceleration is available. Task-number: QTBUG-29641 Change-Id: I438bd5ce4e803962fd68c7e9d79f40840760e2d5 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* QLocale: Update the Japanese and Czech localeEl Mehdi Fekari2013-02-123-53/+106
| | | | | | | | | | | - Japanese locale: Year should be displayed in 4 digits instead of 2 in short format - Czech locale: monthName should be displayed in lower case N.B: The changes above are already fixed on Qt 5 that uses an updated version (v22.1) of CLDR Change-Id: I40535ea60b1f6abdd3717a28adbcddaa63b39997 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Enable autodetection of VxWorks fb driver for available qt-gfx listPasi Petäjäjärvi2013-02-121-0/+6
| | | | | | | | If the VxWorks drivers are in the source tree, show them as available. Not applicable to Qt5 as it does not have anymore QWS. Change-Id: I0005f9d67922679a102b5b69f4c7051afef60ba2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>