blob: 45b8c10fbe97ced2cdaabc741f915dc480457d27 [file] [log] [blame]
Patrick Williamsc124f4f2015-09-15 14:41:29 -05001From e129dc0d6cde69dd15d1836c4111e0526fc29161 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Wed, 26 Sep 2012 20:33:49 +0200
4Subject: [PATCH 09/21] qmake: fix source file references in qmake.pri
5
6Fix duplicate entries in SOURCES and HEADERS, and fix the source file
7list for the split of qlocale.cpp.
8
9Upstream-Status: Pending
10
11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 qmake/qmake.pri | 8 ++++----
15 1 file changed, 4 insertions(+), 4 deletions(-)
16
17diff --git a/qmake/qmake.pri b/qmake/qmake.pri
18index 31f67f4..9081669 100644
19--- a/qmake/qmake.pri
20+++ b/qmake/qmake.pri
21@@ -22,8 +22,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \
22 generators/symbian/initprojectdeploy_symbian.cpp \
23 generators/integrity/gbuild.cpp \
24 windows/registry.cpp \
25- symbian/epocroot.cpp \
26- generators/integrity/gbuild.cpp
27+ symbian/epocroot.cpp
28
29 HEADERS += project.h property.h generators/makefile.h \
30 generators/unix/unixmake.h meta.h option.h cachekeys.h \
31@@ -40,8 +39,7 @@ HEADERS += project.h property.h generators/makefile.h \
32 generators/symbian/initprojectdeploy_symbian.h \
33 generators/integrity/gbuild.h \
34 windows/registry_p.h \
35- symbian/epocroot_p.h \
36- generators/integrity/gbuild.h
37+ symbian/epocroot_p.h
38
39 contains(QT_EDITION, OpenSource) {
40 DEFINES += QMAKE_OPENSOURCE_EDITION
41@@ -72,6 +70,8 @@ bootstrap { #Qt code
42 qlist.cpp \
43 qlinkedlist.cpp \
44 qlocale.cpp \
45+ qlocale_tools.cpp \
46+ qlocale_unix.cpp \
47 qmalloc.cpp \
48 qmap.cpp \
49 qmetatype.cpp \
50--
511.8.0
52