[Kde-bindings] [Bug 225154] New: Fix QtGuess.txt for Windows and qfeatures.h

[rmelton at ball.com]

https://bugs.kde.org/show_bug.cgi?id=225154

           Summary: Fix QtGuess.txt for Windows and qfeatures.h
           Product: bindings
           Version: unspecified
          Platform: Compiled Sources
        OS/Version: MS Windows
            Status: UNCONFIRMED
          Severity: normal
          Priority: NOR
         Component: general
        AssignedTo: kde-bindings at kde.org
        ReportedBy: rmelton at ball.com


Version:            (using Devel)
Compiler:          gcc4 
OS:                MS Windows
Installed from:    Compiled sources

This change will allow QtGuess.txt to work correctly on Windows.  Because
windows has no symlinks, the Windows SDK uses #include inside of its header
files to "link" to the real location of qconfig.h, qglobal.h, and qfeatures.h.

Note: This affects both the qt and the qtcore QtGuess.txt files and that
changing "qfeatures" to "qfeatures_h" in the set line affects all operating
systems.

Is at line 109:

file(STRINGS "${QT_QTCORE_INCLUDE_DIR}/qglobal.h" qglobal_h NEWLINE_CONSUME)
file(STRINGS "${QT_QTCORE_INCLUDE_DIR}/qconfig.h" qconfig_h NEWLINE_CONSUME)
file(STRINGS "${QT_QTCORE_INCLUDE_DIR}/qfeatures.h" qfeatures_h
NEWLINE_CONSUME)
set(qtheaders "${qglobal_h}\n${qconfig_h}\n${qfeatures}")

Should Be:

if(WIN32)
  file(STRINGS "${QT_QTCORE_INCLUDE_DIR}/../../src/corelib/global/qglobal.h"
qglobal_h NEWLINE_CONSUME)
  file(STRINGS "${QT_QTCORE_INCLUDE_DIR}/../../src/corelib/global/qconfig.h"
qconfig_h NEWLINE_CONSUME)
  file(STRINGS "${QT_QTCORE_INCLUDE_DIR}/../../src/corelib/global/qfeatures.h"
qfeatures_h NEWLINE_CONSUME)
else(WIN32)
  file(STRINGS "${QT_QTCORE_INCLUDE_DIR}/qglobal.h" qglobal_h NEWLINE_CONSUME)
  file(STRINGS "${QT_QTCORE_INCLUDE_DIR}/qconfig.h" qconfig_h NEWLINE_CONSUME)
  file(STRINGS "${QT_QTCORE_INCLUDE_DIR}/qfeatures.h" qfeatures_h
NEWLINE_CONSUME)
endif(WIN32)
set(qtheaders "${qglobal_h}\n${qconfig_h}\n${qfeatures_h}")

-- 
Configure bugmail: https://bugs.kde.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.