Don't like ads? PRO users don't see any ads ;-)
Public Pastes
Guest

Untitled

By: a guest on May 30th, 2012  |  syntax: None  |  size: 1.26 KB  |  hits: 8  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. commit 6dbcd570b8c8442bbf13f54ff49e7d3674ac2c56
  2. Author: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
  3. Date:   Mon Nov 7 12:49:49 2011 +0100
  4.  
  5.     [Qt] Print right order for changing feature defines
  6.    
  7.     Reviewed by Simon Hausmann.
  8.  
  9. diff --git a/Tools/ChangeLog b/Tools/ChangeLog
  10. index fc89dc7..4cafda4 100644
  11. --- a/Tools/ChangeLog
  12. +++ b/Tools/ChangeLog
  13. @@ -1,3 +1,12 @@
  14. +2011-11-07  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
  15. +
  16. +        [Qt] Print right order for changing feature defines
  17. +
  18. +        Reviewed by Simon Hausmann.
  19. +
  20. +        * Scripts/webkitdirs.pm:
  21. +        (buildQMakeProject):
  22. +
  23.  2011-11-04  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
  24.  
  25.          [Qt] Don't warn about disabling WebKit2 when qmake does recursive includes
  26. diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
  27. index b61676f..f639fb3 100755
  28. --- a/Tools/Scripts/webkitdirs.pm
  29. +++ b/Tools/Scripts/webkitdirs.pm
  30. @@ -1764,7 +1764,7 @@ sub buildQMakeProject($@)
  31.                      }
  32.  
  33.                      if ($defines{$1} != $2) {
  34. -                        print "Feature $1 has changed ($defines{$1} -> $2)";
  35. +                        print "Feature $1 has changed ($2 -> $defines{$1})";
  36.                          $needsCleanBuild = 1;
  37.                          last;
  38.                      }
create a new version of this paste RAW Paste Data