Merge branch 'buildsystem' (second round)

refactoring and cleanup. fixes x-builds between different os families.

Conflicts:
	mkspecs/features/qt.prf

Change-Id: I0205e6f07f77c9b015cf055dd87a471883949a91

diff --cc mkspecs/features/qt.prf
index 03e58b3,ed483c8..1d1e17c
--- 1/mkspecs/features/qt.prf
--- 2/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@@ -2,24 -2,15 +2,18 @@@ CONFIG *= threa
  
  #handle defines
  win32 {
 -   qt_static:DEFINES += QT_NODLL
 -   !contains(DEFINES, QT_NODLL) {
 -      QT_ENV_DLL = $$(QT_DLL)
 -      QT_ENV_NO_DLL = $$(QT_NODLL)
 -      isEmpty(QT_ENV_NO_DLL) {
 -          shared|!isEmpty(QT_ENV_DLL):DEFINES += QT_DLL
 -      }
 -      contains(DEFINES, QT_MAKEDLL)|contains(DEFINES, QT_DLL):QMAKE_QT_DLL = 1
 +   # ### QT_NODLL and QT_DLL are compatibility, remove before the Qt 5.0 release
 +   contains(QT_CONFIG, shared) {
 +      DEFINES += QT_DLL
 +
 +      # this variable is read by qmake in qmake/generators/win32/msvc_vcproj.cpp
 +      # function VcprojGenerator::initDeploymentTool(), which contains some hardcoded
 +      # library names (the ones that were static in Qt 4)
 +      # it probably doesn't work anymore and should not be in this file
 +      QMAKE_QT_DLL = 1
 +   } else {
 +      DEFINES += QT_NODLL
     }
- 
-    # Some files include qplatformdefs.h, which lives in the individual mkspec directory
-    # However, if QMAKESPEC_ORIGINAL is set, the module/app is outside of the QtBase
-    # directory, and using the default profile. So we add the original mkspecs directory
-    # to the include path
-    !isEmpty(QMAKESPEC_ORIGINAL):INCLUDEPATH += $$QMAKESPEC_ORIGINAL
  }
  CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG
  contains(QT_CONFIG, force_asserts):DEFINES += QT_FORCE_ASSERTS

diff --cc tools/configure/configureapp.cpp
Simple merge