From 63186806ec04ea08d8ed1e4e9b8ed9d06b52190d Mon Sep 17 00:00:00 2001 From: Alexis Menard Date: Fri, 3 Jun 2011 16:21:48 -0300 Subject: Some qmake black magic to pick up the right file. I deleted the old hack of Andreas, it's not needed. Reviewed-by: Andreas Kling --- src/3rdparty/webkit/Source/Source.pro | 1 - src/src.pro | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 src/3rdparty/webkit/Source/Source.pro diff --git a/src/3rdparty/webkit/Source/Source.pro b/src/3rdparty/webkit/Source/Source.pro deleted file mode 100644 index 38bf22d..0000000 --- a/src/3rdparty/webkit/Source/Source.pro +++ /dev/null @@ -1 +0,0 @@ -include(WebKit.pro) diff --git a/src/src.pro b/src/src.pro index efd1ac9..c8b6141 100644 --- a/src/src.pro +++ b/src/src.pro @@ -80,7 +80,7 @@ src_testlib.subdir = $$QT_SOURCE_TREE/src/testlib src_testlib.target = sub-testlib src_javascriptcore.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/JavaScriptCore src_javascriptcore.target = sub-javascriptcore -src_webkit.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/ +src_webkit.file = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/WebKit.pro src_webkit.target = sub-webkit src_declarative.subdir = $$QT_SOURCE_TREE/src/declarative src_declarative.target = sub-declarative -- cgit v0.12 tion value='QT_5_14'>QT_5_14 Qt s a cross-platform application framework that is used for developing application software that can be run on various software and hardware platforms with little or no change in the underlying codebase, while still being a native application with native capabilities and speed.
summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix autotest to accept Symbian OS behaviour as a pass.Shane Kearns2009-08-181-2/+29
| | | | | | | | | | | Symbian generates a directory change event when a file is overwritten in that directory. Autotest was asserting that no change event is generated in this situation (documentation allows it in the signal description) So the test now allows 0 or 1 dir changed events, to allow existing platforms and symbian to both pass. Reviewed-by: brad
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-1848-839/+154
|\
| * Use qt_TDesC2QString() instead qstringFromDesc().Aleksandar Sasha Babic2009-08-171-15/+11
| | | | | | | | That way we will avoid duplicated functionality.
| * rename QLockedMutexUnlocker to QMutexUnlockerHarald Fernengel2009-08-171-5/+5
| | | | | | | | Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * Changed to SymbianVersion enum after review.axis2009-08-172-9/+9
| | | | | | | | | | RevBy: Trust me AutoTest: It built...
| * Merge branch 'fixCursorLagInVK'axis2009-08-171-0/+2
| |\
| | * Fix the cursor lagging one step behind in the Virtual Keyboard UI.axis2009-08-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was caused by the widget not calling update on the input context after changes to the cursor position. This is a reimplementation of 8d1691e9395, after the QLineControl refactoring. RevBy: Trust me AutoTest: Passed
| * | Fixed a compile error for qs60style.cpp on s60 build.Liang Qi2009-08-151-1/+1
| | |
| * | Remove the history files for autotest, and move the whitelist files to ↵Liang Qi2009-08-1425-740/+0
| | | | | | | | | | | | autotest repo.
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicAlessandro Portale2009-08-141-3/+1
| |\ \
| | * | remove a ### commentLars Knoll2009-08-141-3/+1
| | | | | | | | | | | | | | | | | | | | The change is actually correct, as we only need the commented out codepath for debugging.
| * | | Removing some unused variables.Alessandro Portale2009-08-146-17/+0
| |/ / | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qwindowsstyle.cpp
| * | Fix incorrect logic in QPixmap::fromSymbianCFbsBitmap.Jason Barron2009-08-142-1/+12
| | | | | | | | | | | | | | | | | | In some alternate universes it might make sense to use a pointer before checking if it is valid, but since this isn't one we shoudn't do it. Also extend the autotest a little to make sure we catch this case.
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicSami Merilä2009-08-143-7/+57
| |\ \
| | * | Fixed the tst_QFileInfo::isHidden test to actually test for hiddenMiikka Heikkinen2009-08-142-4/+53
| | | | | | | | | | | | | | | | attribute in Symbian in a meaningful way.
| | * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-143-13/+18
| | |\ \
| | * | | Fixed merge failure in qfsfileengine_unix.cpp.Miikka Heikkinen2009-08-141-3/+4
| | | | |
| * | | | S60Style: Draw vertical busy indicator with correct graphic.Sami Merilä2009-08-141-1/+3
| | |/ / | |/| |
| * | | S60Style: Draw QFrames in default casesSami Merilä2009-08-141-0/+2
| | | |
| * | | S60Style: Draw non-initialized icons as enabled.Sami Merilä2009-08-141-1/+1
| | | |
| * | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-142-6/+6
| |\ \ \
| | * | | Changed QCoeFepInputContext::ReportAknEdStateEvent so that it actually ↵mread2009-08-141-1/+1
| | |/ / | | | | | | | | | | | | forwards the event and doesn't just send a fixed one.
| | * | Fixed network-settings.h build for symbianMiikka Heikkinen2009-08-141-5/+5
| | | |
| * | | Fixed QKeySequence autotest for Symbian.Janne Anttila2009-08-141-11/+14
| |/ /
| * | Partially revert oom safety fixesHarald Fernengel2009-08-141-18/+9
| | | | | | | | | | | | | | | Turns out it's way too much work to make all the Pixmap backends strongly exception safe. Bumped to "future Qt version" :)
| * | Fixed qdir autotest for SymbianMiikka Heikkinen2009-08-141-5/+22
| | |
* | | Fixes to Symbian native engine for QFileSystemWatcher.Shane Kearns2009-08-182-12/+21
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wrong version of cancel was used, resulting in all filesystem notifications being cancelled when one path was removed from the engine. For directory notifications, changed ENotifyAll to ENotifyEntry to reduce the spurious directory changed notifications which come from file modifications within that directory. On Symbian OS, opening a file for overwrite (truncate mode in Qt terms) will cause a directory change notification, the OS considers it to be the same type of event as creating a new file for the first time. Other platforms presumably do not have this behaviour otherwise the auto test would fail there as well. Reviewed-by: miikka heikkinen
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-14