Summary: | [Qt] Need a final integration between QtLauncher and QGVLauncher | ||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Jesus Sanchez-Palencia <jesus> | ||||||||||||
Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> | ||||||||||||
Status: | RESOLVED FIXED | ||||||||||||||
Severity: | Normal | CC: | cjerdonek, commit-queue, eric, tonikitoo, webkit.review.bot | ||||||||||||
Priority: | P2 | ||||||||||||||
Version: | 528+ (Nightly build) | ||||||||||||||
Hardware: | PC | ||||||||||||||
OS: | All | ||||||||||||||
Attachments: |
|
Description
Jesus Sanchez-Palencia
2010-02-23 06:46:23 PST
Created attachment 49290 [details]
Clone Window feature
Strongly based on the old code from QGVLauncher.
Attachment 49290 [details] did not pass style-queue:
Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1
WebKitTools/QtLauncher/main.cpp:163: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5]
WebKitTools/QtLauncher/main.cpp:188: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5]
Total errors found: 2 in 2 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Created attachment 49291 [details]
Remove QGVLauncher
This patch should land only after the clone window patch.
Created attachment 49294 [details]
Clone Window feature - v2
style-check fixes.
Comment on attachment 49294 [details] Clone Window feature - v2 > - LauncherWindow(QString url = QString()); > + LauncherWindow(QString url = QString(), QGraphicsScene* scene = 0); Doing two constructors seems better, with a private ::init() method. jeez, we also try to avoid this kind of thing: - initializeView(); + + // if there is a Scene, we should enable QGraphicsView mode + if (scene == 0) + initializeView(); + else + initializeView(true); bool parameter is contextless Created attachment 49300 [details]
Clone Window feature - v3
Now with 2 constructors and a private init. :)
Created attachment 49303 [details]
Coding Style fixes
check-webkit-style was complaining about these lines.
Comment on attachment 49300 [details] Clone Window feature - v3 Clearing flags on attachment: 49300 Committed r55163: <http://trac.webkit.org/changeset/55163> Comment on attachment 49291 [details] Remove QGVLauncher Rejecting patch 49291 from commit-queue. Failed to run "['/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', '--reviewer', 'Kenneth Rohde Christiansen', '--force']" exit_code: 2 Last 500 characters of output: -------------------- patching file ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebKit.pro patching file WebKit/qt/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebKit/qt/QGVLauncher/QGVLauncher.pro rm 'WebKit/qt/QGVLauncher/QGVLauncher.pro' patching file WebKit/qt/QGVLauncher/main.cpp rm 'WebKit/qt/QGVLauncher/main.cpp' Could not open 'WebKit/qt/QGVLauncher' to list files: 0 at /Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply line 314, <> line 648. Full output: http://webkit-commit-queue.appspot.com/results/299977 Comment on attachment 49303 [details] Coding Style fixes Clearing flags on attachment: 49303 Committed r55164: <http://trac.webkit.org/changeset/55164> (In reply to comment #10) Eric, do you know what went wrong here? > (From update of attachment 49291 [details]) > Rejecting patch 49291 from commit-queue. > > Failed to run > "['/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', > '--reviewer', 'Kenneth Rohde Christiansen', '--force']" exit_code: 2 > Last 500 characters of output: > -------------------- > patching file ChangeLog > Hunk #1 succeeded at 1 with fuzz 3. > patching file WebKit.pro > patching file WebKit/qt/ChangeLog > Hunk #1 succeeded at 1 with fuzz 3. > patching file WebKit/qt/QGVLauncher/QGVLauncher.pro > rm 'WebKit/qt/QGVLauncher/QGVLauncher.pro' > patching file WebKit/qt/QGVLauncher/main.cpp > rm 'WebKit/qt/QGVLauncher/main.cpp' > Could not open 'WebKit/qt/QGVLauncher' to list files: 0 at > /Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply line 314, <> > line 648. > > Full output: http://webkit-commit-queue.appspot.com/results/299977 Thanks svn-apply must be having trouble with your patch. Possibly for moving directories or some other unsupported feature of svn-apply. Patches landed, bug closed. |