1. 19 Aug, 2016 - 1 commit
  2. 18 Aug, 2016 - 6 commits
    • Lars Knoll's avatar
      Make the ICO image format a configurable feature · 6903cad0
      Lars Knoll authored
      
      ... including a [-no]-ico command line option.
      
      Change-Id: I3cb13d2be72b512f72f8dcdb9de72e7a99e36e47
      Reviewed-by: default avatarLars Knoll <lars.knoll@qt.io>
      Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
      6903cad0
    • Lars Knoll's avatar
      Use the qmake based configuration system also on Windows · 97b856b7
      Lars Knoll authored
      
      Adapt configure.exe to use qmake to do most of the work of configuring
      Qt. This unifies a large part of our configuration system between Unix
      and Windows. configure.exe is now still doing the license check,
      creating qconfig.cpp, building qmake, and not much more.
      
      On the way, re-implement the still missing Windows-specific tests with
      the new system.
      
      The opengles2 vs. opengl-desktop conditions got a bit convoluted, as
      Unix prefers desktop GL, while Windows GLES2 (via ANGLE). Superficially,
      there is a circular dependency, but the platform scopes are supposed to
      break it.
      
      Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
      Change-Id: Ia1941f2c34b7f5bd4990a7673cd737361381c2e7
      Reviewed-by: default avatarLars Knoll <lars.knoll@qt.io>
      Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
      97b856b7
    • Oswald Buddenhagen's avatar
      make the windows configure also use config_help.txt · c027cffb
      Oswald Buddenhagen authored
      
      specifically, make configure.bat dump the text file (which got some
      windows-specific adjustments).
      
      incidentally, this change removes the need for including a pre-built
      configure.exe into our source packages.
      
      Change-Id: Ib3515c113f3602767554fe1493df226551a7bf10
      Reviewed-by: default avatarLars Knoll <lars.knoll@qt.io>
      c027cffb
    • Oswald Buddenhagen's avatar
      unify configure command line saving with configure.exe · 672c0b37
      Oswald Buddenhagen authored
      
      that is, save it to config.opt and recall it when -redo is used (and do
      not write it again in this case).
      
      a trivial config.status is still created, as having it is very
      convenient when shadow-building.
      
      Task-number: QTBUG-38792
      Change-Id: I5e9f7374d6bfc60c427cbfd5e9b3e68bfcaae9f2
      Reviewed-by: default avatarLars Knoll <lars.knoll@qt.io>
      672c0b37
    • Oswald Buddenhagen's avatar
      replace mechanism to override variables from the mkspecs · fd3e12e7
      Oswald Buddenhagen authored
      
      it is sometimes desirable to override values from the mkspec without
      modifying (or wrapping) the spec itself. linux distributors do this on a
      regular basis.
      
      so far, we'd pick up CFLAGS, etc. from the environment, in a somewhat
      autoconf-like fashion. however, over time, this approach proved
      problematic: the concept doesn't mix particularly well with mkspecs to
      start with, is unexpected (and therefore causes frustration), and
      doesn't mix well with cross-building (at least the way it was realized).
      ironically, it was implemented this way (quite a while ago) upon my
      explicit request ...
      
      the new mechanism uses explicit variable manipulations on the configure
      command line, just like qmake itself understands. as it happens, this is
      again quite similar to autoconf-generated configure scripts. however,
      this time around we don't pretend to be actually autoconf-like, so we
      also don't try to map any variable names (some of which have different
      semantics anyway).
      
      this commit also eliminates the last use of the QMakeVar() function,
      so delete it and the underlying infrastructure.
      
      Task-number: QTBUG-32530
      Task-number: QTBUG-42962
      Change-Id: Id31a6b80e1add08ca21f5b178614bda530d12374
      Reviewed-by: default avatarLars Knoll <lars.knoll@qt.io>
      fd3e12e7
    • Lars Knoll's avatar
      Add configure.exe-like FOO_LIBS=bar style command line options · 9172143f
      Lars Knoll authored
      
      Add the command line options supported by the windows version of
      configure and respect them when running our configure tests.
      
      Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
      Change-Id: I1206d60a177e251540d34d232c73c930847564b3
      Reviewed-by: default avatarLars Knoll <lars.knoll@qt.io>
      9172143f
  3. 11 Aug, 2016 - 2 commits
  4. 27 Jul, 2016 - 1 commit
  5. 13 Jul, 2016 - 1 commit
  6. 27 May, 2016 - 1 commit
    • Andy Shaw's avatar
      Turn off libproxy support by default · 5011b746
      Andy Shaw authored
      
      Since the system proxies are on by default now then we turn off
      libproxy support by default so that there is no risk of a conflict
      occurring.
      
      For instance on Linux, it is possible that libproxy indirectly causes
      KDE 4 libraries to be loaded which will cause a conflict with the Qt 5
      libraries. Therefore we turn it off by default, since the system
      proxy setting is the overall better one to have.
      
      [ChangeLog][Important Behavior Changes][QtNetwork] libproxy is now
      turned off by default. Configure with -libproxy in order to enable it
      again.
      
      Task-number: QTBUG-53649
      Change-Id: I0c6c5b9091dc2b2b7662fd44f2a1b49c622e563f
      Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
      Reviewed-by: default avatarRobin Burchell <robin.burchell@viroteck.net>
      Reviewed-by: default avatarRichard J. Moore <rich@kde.org>
      5011b746
  7. 25 May, 2016 - 1 commit
  8. 01 May, 2016 - 1 commit