diff options
| author | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2011-04-12 13:58:47 +0200 |
|---|---|---|
| committer | Prasanth Ullattil <prasanth.ullattil@nokia.com> | 2011-04-12 13:58:47 +0200 |
| commit | 5dc1a8bbc0eaaa2bb1d23e6f459df3f63c4bf19f (patch) | |
| tree | 87cb5ecd00d70db6280c0772fb196ee84819af6c | |
| parent | e37c12e53cf068d5a147bd91f7d37bd0e183c8b9 (diff) | |
Fix for headersclean autotest build error on Mac
| -rw-r--r-- | afterlive/qtbase/0003-Moved-QtUiTools-to-CONFIG.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/afterlive/qtbase/0003-Moved-QtUiTools-to-CONFIG.patch b/afterlive/qtbase/0003-Moved-QtUiTools-to-CONFIG.patch new file mode 100644 index 0000000..7e6475a --- /dev/null +++ b/afterlive/qtbase/0003-Moved-QtUiTools-to-CONFIG.patch @@ -0,0 +1,32 @@ +From f2a61df8b9ede9c7bbbc79aaa372d671aa43efd1 Mon Sep 17 00:00:00 2001 +From: Prasanth Ullattil <prasanth.ullattil@nokia.com> +Date: Tue, 12 Apr 2011 13:50:27 +0200 +Subject: [PATCH] Moved QtUiTools to CONFIG + +QtUiTools is a staic library now. If this is added to QT variable +qmake will treat this as a framework on Mac. This patch is to +avoid that. +--- + tests/auto/headersclean/headersclean.pro | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro +index d9b6ae3..0f976ff 100644 +--- a/tests/auto/headersclean/headersclean.pro ++++ b/tests/auto/headersclean/headersclean.pro +@@ -1,7 +1,9 @@ + load(qttest_p4) + SOURCES += tst_headersclean.cpp +-QT = core network xml sql uitools ++QT = core network xml sql ++CONFIG += uitools + + contains(QT_CONFIG,dbus): QT += dbus + contains(QT_CONFIG,opengl): QT += opengl +-contains(QT_CONFIG,openvg): QT += openvg +\ No newline at end of file ++contains(QT_CONFIG,openvg): QT += openvg ++ +-- +1.7.4 + |