Changeset 24721 in webkit


Ignore:
Timestamp:
Jul 27, 2007 5:26:58 AM (17 years ago)
Author:
zecke
Message:

WebKitQt:

2007-07-27 Holger Hans Peter Freyther <​zecke@selfish.org>

Reviewed by Mark.

Don't create an app bundle on OSX to keep WebKitTools/Scripts/run-launcher working.

  • QtLauncher/QtLauncher.pro:

WebKitTools:
2007-07-27 Holger Hans Peter Freyther <​zecke@selfish.org>

Reviewed by Mark.

Correct the path of GdkLauncher and make checkFrameworks work on OSX
when building the Qt or Gtk+ port.

  • GdkLauncher/GdkLauncher.pro: Don't create an app bundle on OSX
  • Scripts/run-launcher:
  • Scripts/webkitdirs.pm: Don't add WebKit if we build the Qt or Gtk+ port.
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKitQt/ChangeLog

    r24670 r24721  
     12007-07-27  Holger Hans Peter Freyther  <zecke@selfish.org>
     2
     3        Reviewed by Mark.
     4
     5        Don't create an app bundle on OSX to keep WebKitTools/Scripts/run-launcher working.
     6
     7        * QtLauncher/QtLauncher.pro:
     8
    192007-07-27  Simon Hausmann  <hausmann@kde.org>
    210

  • trunk/WebKitQt/QtLauncher/QtLauncher.pro

    r24641 r24721  
    11TEMPLATE = app
    22SOURCES += main.cpp
     3CONFIG -= app_bundle
    34
    45include(../../WebKit.pri)

  • trunk/WebKitTools/ChangeLog

    r24712 r24721  
     12007-07-27  Holger Hans Peter Freyther  <zecke@selfish.org>
     2
     3        Reviewed by Mark.
     4
     5        Correct the path of GdkLauncher and make checkFrameworks work on OSX
     6        when building the Qt or Gtk+ port.
     7
     8        * GdkLauncher/GdkLauncher.pro: Don't create an app bundle on OSX
     9        * Scripts/run-launcher:
     10        * Scripts/webkitdirs.pm: Don't add WebKit if we build the Qt or Gtk+ port.
     11
    1122007-07-27  Simon Hausmann  <hausmann@kde.org>
    213

  • trunk/WebKitTools/GdkLauncher/GdkLauncher.pro

    r21235 r24721  
    11TEMPLATE = app
    22SOURCES += main.cpp
     3CONFIG -= app_bundle
    34
    45BASE_DIR = $$PWD/../..

  • trunk/WebKitTools/Scripts/run-launcher

    r24423 r24721  
    5050
    5151if (isGdk()) {
    52   $launcherPath = "$launcherPath/WebKitTools/GdkLauncher";
     52  $launcherPath = "$launcherPath/WebKitTools/GdkLauncher/GdkLauncher";
    5353} elsif (isQt()) {
    5454  $launcherPath = "$launcherPath/WebKitQt/QtLauncher/QtLauncher";

  • trunk/WebKitTools/Scripts/webkitdirs.pm

    r24712 r24721  
    320320    return if isCygwin();
    321321    my @frameworks = ("JavaScriptCore", "WebCore");
    322     push(@frameworks, "WebKit") if isOSX();
     322    push(@frameworks, "WebKit") if isOSX() and not isGdk() and not isQt();
    323323    for my $framework (@frameworks) {
    324324        my $path = builtDylibPathForName($framework);
Note: See TracChangeset for help on using the changeset viewer.