summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Include sockLib header to enable usage of socket functions on VxWorksPasi Petäjäjärvi2013-08-061-0/+4
| | | | | | | | Functions normally found from <sys/socket.h> are available on VxWorks from <sockLib.h> header. Change-Id: I2263ec40ba9f37bc95755b633fb43d66ceb2777c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Add side widgets to QLineEdit via QAction.Friedemann Kleint2013-08-065-12/+363
| | | | | | | | | | | | Add QLineEdit::addAction() overloads, allowing for a variable number of icons or user-defined widgets. Change-Id: Id298f18c2f47cc998170357e65cc6098df851aab Done-with: Kevin.Ottens@kdab.com Reviewed-by: Thomas Zander <zander@kde.org> Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* OSX: Make QSslSocket compile on 10.9Liang Qi2013-08-062-15/+15
| | | | | | | | | | CSSM_DATA_PTR was deprecated in 10.7. Replace SecCertificateGetData with SecCertificateCopyData. Task-number: QTBUG-32715 Change-Id: I762687370689b5b5c032567240667631b1ffde98 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* OSX: Make machtest compile on 10.9Liang Qi2013-08-051-2/+2
| | | | | | | | | Added the compiler options, we need the info of sdk. Task-number: QTBUG-32715 Change-Id: I70612f36a16e0ab5025194a10ce399822e159c7c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix clean-up code in Android autotest scriptEskil Abrahamsen Blomfeldt2013-08-051-4/+4
| | | | | | | | | | | If the files directory is not world-readable as well as writable, the "rm *" command will fail because it cannot list the files to delete. Task-number: QTBUG-32079 Change-Id: Idb32a2be3184b9ffc43d011136fcc6f2a2a01756 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* Ensure that output is world readable on AndroidEskil Abrahamsen Blomfeldt2013-08-051-0/+10
| | | | | | | | | | On Android, we need to be able to get access to the output file remotely, so we make it world-readable. Task-number: QTBUG-32079 Change-Id: I0a53a952d03339c0f1a1316f38bd206075589bde Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com>
* Android: Enable script to run single autotestEskil Abrahamsen Blomfeldt2013-08-051-1/+9
| | | | | | | | | To make it easier to debug failures, adds the "testcase" commandline option, which takes the name of the test to run and then just runs this single test. Change-Id: Ib202bb2a5dac889b6691f9c4d0620b3e0941cf3d Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Bypass eglMakeCurrent where possible.Robin Burchell2013-08-051-0/+8
| | | | | | | | | | | This has the possibility to be very slow on some GPUs. A nicer alternative would have been to fix this in QOpenGLContext, but with makeCurrent and updateContext having been merged in Qt 5, makeCurrent is required every frame call, and thus cannot be fixed there. Change-Id: Ib17dbb3a1e4e89c60dfd4f12a55eeff353f9075f Done-with: Carsten Munk <carsten.munk@jollamobile.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* QUrl: do not decode "#" in fragmentsThiago Macieira2013-08-043-8/+13
| | | | | | | | | | | | | | | | | For some time, we've assumed that the URL specification had a mistake in that it didn't allow the "#" character to appear decoded in the fragment. We've gotten away with it so far. However, turns out that the CoreFoundation NSURL class doesn't like it. So we have to be stricter. [ChangeLog][Important Behavior Changes][QUrl and QUrlQuery] QUrl no longer decodes %23 found in the fragment to "#" in the output of toString(QUrl::FullyEncoded) or toEncoded() Task-number: QTBUG-31945 Change-Id: If5e0fb37bae84710986c9ca89bd69ec98437cd63 Reviewed-by: David Faure (KDE) <faure@kde.org>
* Make sure that QUrl::FullyDecoded mode uses U+FFFD for bad UTF-8Thiago Macieira2013-08-042-0/+32
| | | | | | | | It's a good practice to always replace bad UTF-8 sequences with the replacement character. It could be considered a security issue too. Change-Id: I9e7d72e4c4102cdb8334449b5e7f882228a9048f Reviewed-by: David Faure (KDE) <faure@kde.org>
* Remove fully-decoded QUrl user info and authority sectionsThiago Macieira2013-08-042-39/+40
| | | | | | | | | | | | | | | | | | | | Those sections contain more than one components of a URL, separated by delimiters. For that reason, QUrl::FullyDecoded and QUrl::DecodedMode do not make sense, since they would cause the returned value to be ambiguous and/or fail to parse again. In fact, there was a comment in the test saying "look how it becomes ambiguous". Those modes are already forbidden in the setters and getters of the full URL (setUrl(), url(), toString() and toEncoded()). [ChangeLog][Important Behavior Changes][QUrl and QUrlQuery] QUrl no longer supports QUrl::FullyDecoded mode in authority() and userInfo(), nor QUrl::DecodedMode in setAuthority() and setUserInfo(). Change-Id: I538f7981a9f5a09f07d3879d31ccf6f0c8bfd940 Reviewed-by: David Faure (KDE) <faure@kde.org>
* QUrl: remove temporary codeThiago Macieira2013-08-041-3/+0
| | | | | | | | | The setting of EncodeDelimiters was temporary until we could remove the old qt_urlRecode "decode all" mode (not the FullyDecoded mode, that stays). Change-Id: Ic07ebe4bb7fc72351b65bfb4619b71206cc8c0cd Reviewed-by: David Faure (KDE) <faure@kde.org>
* Doc: update the QUrl and QUrlQuery documentationThiago Macieira2013-08-042-28/+102
| | | | | | | | Just minor fixes and changes in wording, to support the new understanding of the percent-encoded characters. Change-Id: I77ec10e41f32292d705e4aa8197b9ddce5bef6d2 Reviewed-by: David Faure (KDE) <faure@kde.org>
* QUrlQuery: update our understanding of delimitersThiago Macieira2013-08-042-35/+27
| | | | | | | | | | | | This commit is similar to the previous commit that changed the behavior of QUrl, but now to QUrlQuery. We can now remove a section of qt_urlDecode, which is no longer used: there's no "decode everything" mode anymore. Task-number: QTBUG-31660 Change-Id: I66cfbfd290eeba5b04688cd5ffd615dd57cc6309 Reviewed-by: David Faure (KDE) <faure@kde.org>
* QUrl: update our understanding of the encoding of delimitersThiago Macieira2013-08-043-352/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The longer explanation can be found in the comment in qurl.cpp. The short version is as follows: Up to now, we considered that every character could be replaced with its percent-encoding equivalent and vice-versa, so long as the parsing of the URL did not change. For example, x:/path+path and x:/path%2Bpath were the same. However, to do this and yet be compliant with most URL uses in the real world, we had to add exceptions: - "/" and "%2F" were not the same in the path, despite the delimiter being behind (rationale was the complex definition of path) - "+" and "%2B" were not the same in the query, so we ended up not transforming any sub-delim in the query at all Now, we change our understanding based on the following line from RFC 3986 section 2.2: URIs that differ in the replacement of a reserved character with its corresponding percent-encoded octet are not equivalent. From now on, QUrl will not replace any sub-delim or gen-delim ("reserved character"), except where such a character could not exist in the first place. This simplifies the code and removes all exceptions. As a side-effect, this has also changed the behaviour of the "{" and "}" characters, which we previously allowed to remain decoded. [ChangeLog][Important Behavior Changes][QUrl and QUrlQuery] QUrl no longer considers all delimiter characters equivalent to their percent-encoded forms. Now, both classes always keep all delimiters exactly as they were in the original URL text. [ChangeLog][Important Behavior Changes][QUrl and QUrlQuery] QUrl no longer decodes %7B and %7D to "{" and "}" in the output of toString() Task-number: QTBUG-31660 Change-Id: Iba0b5b31b269635ac2d0adb2bb0dfb74c139e08c Reviewed-by: David Faure (KDE) <faure@kde.org>
* Doc: Setting module pages' \qtvariable.Jerome Pasion2013-08-0211-0/+11
| | | | | | | | | Argument to \qtvariable is the QT variable needed for linking to the module. Task-number: QTBUG-32172 Change-Id: I181c0cfaf9529f3aea741cdaee0f20d6cd0e2d2f Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Added \qtvariable command to QDoc.Jerome Pasion2013-08-024-7/+36
| | | | | | | | | | | | | | | | Specifies the QT variable needed in the .pro file. The argument of the command is the qmake QT variable. To use, add "\qtvariable <value>" to a QDoc comment which contains the \module command. QDoc will then associate the class with the QT variable. Only supported for C++ classes at the moment. Part of work done for QTBUG-32172 Task-number: QTBUG-32172 Change-Id: Ia8eea30fcfc771191c23a5f5994a48732959ea49 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Added SH_Widget_Animate in QStyleÀlex Fiestas2013-08-027-16/+45
| | | | | | | | | | | Added SH_Widget_Animate in QStyle styleHint, and use it to determine whether widgets should be animated or not. In this patch QTabBar, QColumnView,QTreeView and QWidgetAnimator are patched to obey the new Hint. Change-Id: Iefdbddc52c7843f6653dbfb5462125942489b4d9 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Cocoa: emit currentFontChanged signal in font dialog helperLiang Qi2013-07-311-1/+4
| | | | | | | | | * changeFont is a delegate method of NSFontManager. * exec() will not be called in Qt Quick. Task-number: QTBUG-32450 Change-Id: I05e43ce84d28ff32c88d75bd6ee60653de6ca4f0 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Android: Fix crash when setting WA_NativeWindowEskil Abrahamsen Blomfeldt2013-07-314-2/+11
| | | | | | | | | | | | We don't support native widgets in Android, so we can get into a mess when people set this widget attribute, since the FB compositor will assume that all widgets have their own backing store. This adds a capability flag to the QPlatformIntegration which allows the plugin to disable the WA_NativeWindow feature. Task-number: QTBUG-32685 Change-Id: Ic200487da4a297f71ab594cf7c90d1e1d53bacd3 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* qdoc: Ensure obsolete members file is writtenMartin Smith2013-07-311-0/+7
| | | | | | | | | | | In the case where the only obsolete members of a class were actually non-members but just related functions, the help file writer didn't include a reference to the obsolete members file. This update fixes that bug. Task-number: QTBUG-31379 Change-Id: I065da649bc12e3dcc81244939be0162599d54be9 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Remove hard-coded disabling of qtdeclarative on iOSSimon Hausmann2013-07-311-1/+1
| | | | | | | | Instead the module decides now itself whether it supports iOS or not, because soon it will enable itself :) Change-Id: I4802441f0a01ed62966a7a0e66f5a8ccfe843cb8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Cocoa: align font dialog helper with the color oneLiang Qi2013-07-312-121/+142
| | | | | | | | The reference color dialog helper change is eeffcfbd89a0b386c5757e8c67b76c5bccc84ffd. Change-Id: I35b505cce133adeed91df7c95b21f7c74c55cb53 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Fix application font population on OS XSimon Hausmann2013-07-313-72/+127
| | | | | | | | | | | | | | | | | | | | | | | This patch fixes two issues that prevented the application font related tests of tst_QFontDatabase from passing: * The code for creating the font descriptor after the registration of an app font with file name using CTFontDescriptorCreateWithAttributes must create a dictionary with kCTFontURLAttribute as key and the CFURLRef pointing to the on-disk file as value. Unfortunately the code mixed up keys and values in the dictionary. * Registration of app fonts within QFontDatabase itself on Windows and Fontconfig platforms works by QFontDatabase calling addApplicationFont on the platform db after calling populateFontDatabase(). It assumes that addApplicationFont on the platform db is capable of registering the font right away. This part was also missing from the Mac implementation and this patch implements it by moving the common registration code from a CTFontDescriptorRef out into a separate method, called from populateFontDatabase() as well as addApplicationFont(). Task-number: QTBUG-23062 Change-Id: Ide5e6bf277d99f3cab50ee0d4631cc3fba6d0d45 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Doc: Unified the summary for C++ classes and QML types.Jerome Pasion2013-07-304-26/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The placement of the header, since, inherits, instantiates, and instantiated-by are now in a table. For C++ classes: Header: #include <class name> Since: <version> Instantiated by: <QML type> Inherits: <parent class> Inherited by: <list of classes> For QML types: To import: import <QML module> Since: <version> Inherited by:<list of QML types> Instantiates: <C++ class> Inherits: <parent QML type> Inherited by: <list of QML types> This is only a part of the work being done for QTBUG-32172. Task-number: QTBUG-32172 Change-Id: Ia9d29e824ef7ab4052ea59c6397b5f8fd24022b9 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Assign icons to actions of QLineEdit context menuAurélien Gâteau2013-07-301-0/+13
| | | | | | | | Icons are only set if they are valid. Change-Id: If2398cdc977a3882e7738ef1bcf5519bd7053449 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
* Assign icons to actions of QTextEdit context menuAurélien Gâteau2013-07-301-0/+13
| | | | | | | Icons are only set if they are valid. Change-Id: I7637dec18b3066930455a2f6fd40d87097eb20f7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix warning in configure about not using 'macx-xcode' for Qt itselfTor Arne Vestbø2013-07-301-3/+3
| | | | | | Change-Id: I08f68813ac99f071b6f59a332c99afd75d3de41c Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Move the X11 system tray code from widgets into XCB-plugin.Friedemann Kleint2013-07-3011-100/+404
| | | | | | | | | | | | | | | | | | - Add system tray tracker class to XCB plugin and provide functionality via invokable slots of the native interface. - Remove XLib-dependency of widgets/utils. - Reintroduce tracking of tray window destruction and recreation, which was removed in the XLib-code when porting it from Qt 4 to Qt 5. This paves the way for implementing the tray icon completely in terms of QPlatformSystemTrayIcon at some point later. Change-Id: Ia04268b0e2919c05874a3e9548930535332897c7 Reviewed-by: Alberto Mardegan <mardy@users.sourceforge.net> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Fixed QTextStream "stdin" auto testsBernd Weimer2013-07-303-13/+9
| | | | | | | | On some platforms (like BlackBerry) qDebug doesn't write to stderr, so we directly write to stderr with fprintf. Change-Id: Ib86211c98cf4da1fa2dbea4600a78e2013dc1a5a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* moc: add unittest for --ignore-option-clashesDavid Faure2013-07-302-0/+96
| | | | | | | Based on tst_Moc::frameworkSearchPath(). Change-Id: I4f44f98d62acc1a2a92739cceba731dcb5f661b6 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Add a few more typedefs to QString, for STL compatibilityThiago Macieira2013-07-302-3/+33
| | | | | | | Task-number: QTBUG-22890 Change-Id: I457be6367e577dee30532383d10c519b2f2617b3 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* iOS: Move platform plugin linking logic into iOS-specific qt.prfTor Arne Vestbø2013-07-302-22/+24
| | | | | Change-Id: I54350c8df3fe4bf20fc59cd42a28458018664eef Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Avoided zero devision in cube root approximationBernd Weimer2013-07-292-9/+15
| | | | | | | | Halley's method to get a better approximation is omitted, if it would include a devision by zero (INFINITY/NaN is worse). Change-Id: Ida09326e2b5892d7cb21bcb956631c289e5b56ba Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Uic: remove unused option -3David Faure2013-07-292-8/+0
| | | | | Change-Id: I2ded3a3c90eea0ae37619ff39a8111a589c4573b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix fillRect on RGBA8888 imagesAllan Sandfeld Jensen2013-07-292-17/+83
| | | | | | | | | The fill color was not correctly converted before being filled into RGBA8888 images. This patch adds a function with convertion and adds tests for it to tst_qpainter. Change-Id: If8b0e6db38b2794a60301842e25f377eb7216796 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Implement move-ctor and move-assignment-op for QScopedPointerGiuseppe D'Angelo2013-07-284-0/+196
| | | | | | | | | | | | | | | | | | | | | It makes sense for a QScopedPointer to be movable, for instance for allowing instances to be returned from a function. Ownwership of the managed pointer is still tied to one (and one only) QScopedPointer instance. Moreover, a move assignment operator makes sense as well, as it implementing the equivalent of this->reset(other.take()); only when other is a rvalue and not a lvalue (so either it's a temporary or it's getting explicitly moved in with std::move). This makes QScopedPointer API's a bit closer to std::unique_ptr's one. Task-number: QTBUG-29754 Change-Id: If1ac0c688327a67af4ad5b7ad45b439b022ed1c6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QNX: adapt SSL lib file name lookup heuristicsPeter Hartmann2013-07-261-1/+1
| | | | | | | | | | | | | | | I.e. do not try to load file names that are not there anyhow. The code would search for libcrypto.so.1.0.0 and libssl.so.1.0.0, while on QNX the libs are called libcrypto.so and libssl.so, and there are no symlinks with version numbers. This saves ~ 45 ms in real apps (tested with Facebook, Twitter and Foursquare), and ~ 24 ms at app startup in an isolated app without GUI (difference maybe because threads are fighting for CPU or so). Task-number: QTBUG-32548 Change-Id: I25869538bbfa3c2848541415e8361e0bd7a8fd50 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QUrl: add matches(url, options) method.David Faure2013-07-263-0/+129
| | | | | Change-Id: I534f494aecc48cc2accfcfcb692f35046250b493 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* XCB: Readd support for -name command line argument.Friedemann Kleint2013-07-252-0/+7
| | | | | | | | Task-number: QTBUG-27349 Change-Id: I85390942927cd1c54f76fd7ddc0f3487c7205b57 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Reintroduce -geometry command line argument for X11/XCB.Friedemann Kleint2013-07-253-4/+125
| | | | | | | | | | | Add parsing for the window geometry specification to QGuiApplicationPrivate. Enable the argument under a different name for the other platforms as well. Task-number: QTBUG-27349 Change-Id: I973b2c69f5172f7d0bc983b8ba4b0d164649ef02 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* qdoc: Don't try to output from index nodesMartin Smith2013-07-252-0/+7
| | | | | | | | | | | | When qdoc traverses its internal node tree to generate either the html docs or the help file, it no longer traverses nodes that were added to the tree as the result of reading an index file. Task-number: QTBUG-32622 Change-Id: Iac63ac2ce177b15b85a2aa73850c45891cbbc624 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Re-enable tests tst_qgraphicsproxywidget, tst_qgraphicswidget.Friedemann Kleint2013-07-241-2/+2
| | | | | | | | Task-number: QTBUG-25294 Task-number: QTBUG-20778 Change-Id: I6b6e19e812d5527465c6162e2df2e4807cf160da Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Sergio Ahumada2013-07-24116-1769/+2274
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-23116-1769/+2274
| |\ | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp Change-Id: I18a9d83fc14f4a9afdb1e40523ec51e3fa1d7754
| | * default to -compile-examplesOswald Buddenhagen2013-07-222-19/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because of popular confusion. the packaging scripts now need to use -no-compile-examples explicitly. Task-number: QTBUG-32449 Change-Id: Iecab1f345afe21e540204fe69a2292ef932cbb61 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * don't install mac bundles atomicallyOswald Buddenhagen2013-07-223-27/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... as that causes debug+release installs to overwrite each other's postprocessed files. introduces CONFIG+=sliced_bundle, which instructs qmake to create file-by-file install commands. we don't know whether people are not putting files outside qmake's knowledge into the bundle build dir, so this mode is not necessarily backwards-compatible, and thus off by default. Task-number: QTBUG-28336 Change-Id: I23e90985ccd3311f0237ed61aadca6d7ed8325b7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * mac frameworks: link target alias to Current versionOswald Buddenhagen2013-07-221-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by convention, $target.framework/$target links to Versions/Current/$target, not Versions/$version/$target. Versions/Current already links to $version. so this adds one indirection, but is otherwise the same. Change-Id: If3d1a3713712f4221ec31883977e50bce6f91764 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * fix target strip-ing inside mac bundlesOswald Buddenhagen2013-07-221-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | this went unnoticed so far, because the mac qmakespecs don't define a strip command to start with. Change-Id: Iac3e7ffa6f400373552134a44b9713aaf5f44589 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * make unescapeFilePath() less inefficientOswald Buddenhagen2013-07-221-6/+2
| | | | | | | | | | | | | | | | | | | | | replace() doesn't detach if there is nothing to do. Change-Id: I845b585c766f44a670ca3af1fc11ba03e7317622 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>