HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r808:7ea08dd6d356

Fix shadow build/jom.exe problems

Jani Honkonen -

r808:7ea08dd6d356

parent child

Context file:

r808:7ea08dd6d356

src/chartconfig_p.h +8 0

             #define CHARTCONFIG_H_
             #include "qchartglobal.h"
+            #ifdef Q_CC_MSVC
+            // There is a problem with jom.exe currently. It does not seem to understand QMAKE_EXTRA_TARGETS properly.
+            // This is the case at least with shadow builds.
+            // http://qt-project.org/wiki/jom
+            const char *buildTime = __DATE__;
+            const char *gitHead = "unknown";
+            #else
             #include "qchartversion_p.h"
+            #endif
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

src/src.pro +12 0

                 install_build_private_headers \
+            !win32-msvc*: {
+                # There is a problem with jom.exe currently. It does not seem to understand QMAKE_EXTRA_TARGETS properly.
+                # This is the case at least with shadow builds.
+                # http://qt-project.org/wiki/jom
                 chartversion.target = $$PWD/qchartversion_p.h
                 unix:{
                     chartversion.commands = @echo \
                         "const char *buildTime = \\\"`date +'%y%m%d%H%M'`\\\" \\; \
                         > \
                         $$chartversion.target
                 }
                 chartversion.depends = $$HEADERS \
                     $$SOURCES
                 PRE_TARGETDEPS += $$PWD/qchartversion_p.h
+                QMAKE_CLEAN += $$PWD/qchartversion_p.h
                 QMAKE_EXTRA_TARGETS += chartversion
+            }
             unix:QMAKE_DISTCLEAN += -r \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR

src/qchartversion_p.h removed 0 -1

NO CONTENT: file was removed

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages