diff options
| author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2012-10-04 13:32:49 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-13 19:22:52 (GMT) |
| commit | 7a6cee83e15ab8e0b84603d100cafda7a592b126 (patch) | |
| tree | 7ce152a9812fb9245f7797f111e0c6df581a54b6 | |
| parent | 07c17542bae95cce66c68fed773b2cb13c0fdc92 (diff) | |
| download | Qt-7a6cee83e15ab8e0b84603d100cafda7a592b126.zip Qt-7a6cee83e15ab8e0b84603d100cafda7a592b126.tar.gz Qt-7a6cee83e15ab8e0b84603d100cafda7a592b126.tar.bz2 | |
Pass NEON_ASM directly to SOURCES.
This guarantees that qmake gives them the proper flags (non C++) while
building these asm files.
cherry-picked from qt5/qtbase 1ef74a763a726829bfc26224d82acff207fdc8bb
Change-Id: Iec8dbb2d25700ead99d46b054665b817bbe79b7b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| -rw-r--r-- | src/gui/gui.pro | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 8f72fea..c31e889 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -63,14 +63,13 @@ symbian { neon:*-g++* { DEFINES += QT_HAVE_NEON HEADERS += $$NEON_HEADERS - - DRAWHELPER_NEON_ASM_FILES = $$NEON_ASM + SOURCES += $$NEON_ASM neon_compiler.commands = $$QMAKE_CXX -c neon_compiler.commands += $(CXXFLAGS) -mfpu=neon $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} neon_compiler.dependency_type = TYPE_C neon_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} - neon_compiler.input = DRAWHELPER_NEON_ASM_FILES NEON_SOURCES + neon_compiler.input = NEON_SOURCES neon_compiler.variable_out = OBJECTS neon_compiler.name = compiling[neon] ${QMAKE_FILE_IN} silent:neon_compiler.commands = @echo compiling[neon] ${QMAKE_FILE_IN} && $$neon_compiler.commands |