From eebf42cc0d99534e26da7510c3e72fba339b9829 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 4 Jan 2013 13:44:22 +0100 Subject: The executables always go into QT_HOST_BINS. Task-number: QTBUG-28922 Change-Id: I7afaee292a0026d67866e4f1f711296adee8f8de Reviewed-by: Andy Nichols Reviewed-by: Oswald Buddenhagen --- mkspecs/features/create_cmake.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index 63001f3e89..dd60b31d36 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -52,7 +52,7 @@ contains(CMAKE_LIB_DIR, "$${CMAKE_QT_INSTALL_PREFIX_ESCAPED}.*") { CMAKE_LIB_DIR_IS_ABSOLUTE = True } -CMAKE_BIN_DIR = $$[QT_INSTALL_BINS]/ +CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ contains(CMAKE_BIN_DIR, "$${CMAKE_QT_INSTALL_PREFIX_ESCAPED}.*") { CMAKE_BIN_DIR = $$replace(CMAKE_BIN_DIR, "$$CMAKE_QT_INSTALL_PREFIX_ESCAPED", ) } else { -- cgit v1.2.3 From 724cb5d30fda4b62cbc3fa5ab37da1b9c43dad6a Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Thu, 10 Jan 2013 00:07:48 +1100 Subject: Support MinGW for CTest test cases Change-Id: I581701f0b830292a21bc805da0398cbc96f82918 Reviewed-by: Stephen Kelly --- mkspecs/features/ctest_testcase.prf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/ctest_testcase.prf b/mkspecs/features/ctest_testcase.prf index 93ebd4607d..7f86ca0052 100644 --- a/mkspecs/features/ctest_testcase.prf +++ b/mkspecs/features/ctest_testcase.prf @@ -33,6 +33,7 @@ isEmpty(CMAKE_VERSION) { } else { CMAKE_BUILD_TYPE = Debug CONFIG(release, debug|release):CMAKE_BUILD_TYPE = Release + win32-g++*:CMAKE_GENERATOR = -G \"MinGW Makefiles\" BUILD_DIR = $$replace($$list($$OUT_PWD/build), /, $$QMAKE_DIR_SEP) @@ -42,7 +43,7 @@ isEmpty(CMAKE_VERSION) { check.commands = \ $(MKDIR) $$BUILD_DIR && cd $$BUILD_DIR && \ - cmake $$_PRO_FILE_PWD_ -DCMAKE_BUILD_TYPE=$${CMAKE_BUILD_TYPE} -DCMAKE_PREFIX_PATH=\"$$join(CMAKE_PREFIX_PATH, ;)\" && \ + cmake $$_PRO_FILE_PWD_ $$CMAKE_GENERATOR -DCMAKE_BUILD_TYPE=$${CMAKE_BUILD_TYPE} -DCMAKE_PREFIX_PATH=\"$$join(CMAKE_PREFIX_PATH, ;)\" && \ $(TESTRUNNER) ctest --output-on-failure } -- cgit v1.2.3 From 94649b4cbd174c12aae4c7a2341067c8331379f6 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 8 Jan 2013 12:40:01 +0100 Subject: remove definitions of QMAKE_{LIB,INC}DIR_QT they are gone from all other specs Change-Id: I93f5800971733af9d9dbc66c7a900d1e2e967473 Reviewed-by: Joerg Bornemann --- mkspecs/win32-msvc2012/qmake.conf | 2 -- 1 file changed, 2 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/win32-msvc2012/qmake.conf b/mkspecs/win32-msvc2012/qmake.conf index 53170c8436..8a595d16b1 100644 --- a/mkspecs/win32-msvc2012/qmake.conf +++ b/mkspecs/win32-msvc2012/qmake.conf @@ -51,8 +51,6 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc QMAKE_CXXFLAGS_EXCEPTIONS_OFF = QMAKE_INCDIR = -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< -- cgit v1.2.3 From 90cb4d8e2e15ec3ebcf008dbc2d1b0c3cb975791 Mon Sep 17 00:00:00 2001 From: Milian Wolff Date: Mon, 14 Jan 2013 15:30:25 +0100 Subject: Fix QtBase cross compilation in debug mode for iMX6 targets. The platform specific CFLAGS, most notably -march=armv7-a, were only added to QMake's _RELEASE flags but not to the _DEBUG flags. This then resulted in strange compilation errors such as this one: http://qt-project.org/forums/viewthread/22141 Change-Id: Ib47996c6946b043294437e8543827da270df836d Reviewed-by: Oswald Buddenhagen --- mkspecs/devices/linux-imx6-g++/qmake.conf | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/devices/linux-imx6-g++/qmake.conf b/mkspecs/devices/linux-imx6-g++/qmake.conf index 322a19d05b..20f6d115bf 100644 --- a/mkspecs/devices/linux-imx6-g++/qmake.conf +++ b/mkspecs/devices/linux-imx6-g++/qmake.conf @@ -27,9 +27,12 @@ QMAKE_LIBS_OPENVG += -lOpenVG -lEGL -lGAL QMAKE_LFLAGS += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib -IMX6_CFLAGS = -O2 -march=armv7-a -mfpu=neon -DLINUX=1 -DEGL_API_FB=1 -QMAKE_CFLAGS_RELEASE += $$IMX6_CFLAGS -QMAKE_CXXFLAGS_RELEASE += $$IMX6_CFLAGS +IMX6_CFLAGS = -march=armv7-a -mfpu=neon -DLINUX=1 -DEGL_API_FB=1 +IMX6_CFLAGS_RELEASE = -O2 $$IMX6_CFLAGS +QMAKE_CFLAGS_RELEASE += $$IMX6_CFLAGS_RELEASE +QMAKE_CXXFLAGS_RELEASE += $$IMX6_CFLAGS_RELEASE +QMAKE_CFLAGS_DEBUG += $$IMX6_CFLAGS +QMAKE_CXXFLAGS_DEBUG += $$IMX6_CFLAGS include(../common/linux_device_post.conf) -- cgit v1.2.3