Title: [121910] trunk
- Revision
- 121910
- Author
- ves...@webkit.org
- Date
- 2012-07-05 09:39:54 -0700 (Thu, 05 Jul 2012)
Log Message
[Qt] Move Webkit1 before WebKit2 in the build order
Reviewed by Csaba Osztrogonác.
* WebKit.pro:
Modified Paths
Diff
Modified: trunk/ChangeLog (121909 => 121910)
--- trunk/ChangeLog 2012-07-05 16:21:43 UTC (rev 121909)
+++ trunk/ChangeLog 2012-07-05 16:39:54 UTC (rev 121910)
@@ -1,3 +1,11 @@
+2012-07-05 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
+ [Qt] Move Webkit1 before WebKit2 in the build order
+
+ Reviewed by Csaba Osztrogonác.
+
+ * WebKit.pro:
+
2012-07-05 Ryuan Choi <ryuan.c...@samsung.com>
[CMAKE] Unreviewd typo fix after r121857
Modified: trunk/WebKit.pro (121909 => 121910)
--- trunk/WebKit.pro 2012-07-05 16:21:43 UTC (rev 121909)
+++ trunk/WebKit.pro 2012-07-05 16:39:54 UTC (rev 121910)
@@ -28,18 +28,18 @@
WebCore.makefile = Makefile.WebCore
SUBDIRS += WebCore
+!no_webkit1 {
+ webkit1.file = Source/WebKit/WebKit1.pro
+ webkit1.makefile = Makefile.WebKit1
+ SUBDIRS += webkit1
+}
+
!no_webkit2 {
webkit2.file = Source/WebKit2/WebKit2.pro
webkit2.makefile = Makefile.WebKit2
SUBDIRS += webkit2
}
-!no_webkit1 {
- webkit1.file = Source/WebKit/WebKit1.pro
- webkit1.makefile = Makefile.WebKit1
- SUBDIRS += webkit1
-}
-
QtWebKit.file = Source/QtWebKit.pro
QtWebKit.makefile = Makefile.QtWebKit
SUBDIRS += QtWebKit
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
