diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-04-20 13:57:51 -0500 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-02 15:30:08 +0200 |
| commit | 1287361f64c6d429535e65c8dd248a94dfc633d1 (patch) | |
| tree | b53e7cc3d3efb44513c97f257316bba9e69abbef /qmake/Makefile.unix | |
| parent | 2e8b6dcb4a6fa8ff42e967eb5dc27a461e721858 (diff) | |
Move private headers into versioned subdirectory
This will allow us to expose private headers in a controlled manner,
and ensure that they are not used by accident. This also means that
we internally will have to enable the private headers for the
modules we wish to use in the project.
Diffstat (limited to 'qmake/Makefile.unix')
| -rw-r--r-- | qmake/Makefile.unix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 9dbe035fc2..c522779981 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -1,5 +1,6 @@ SOURCE_PATH = @SOURCE_PATH@ BUILD_PATH = @BUILD_PATH@ +QT_VERSION = @QT_VERSION@ QTOBJS = @QMAKE_QTOBJS@ QTSRCS = @QMAKE_QTSRCS@ QMAKESPEC = @QMAKESPEC@ @@ -76,6 +77,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp generators/makefile.cpp ge CPPFLAGS = -g -I. -Igenerators -Igenerators/unix -Igenerators/win32 \ -Igenerators/mac -Igenerators/symbian -Igenerators/integrity \ -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \ + -I$(BUILD_PATH)/include/QtCore/$(QT_VERSION) -I$(BUILD_PATH)/include/QtCore/$(QT_VERSION)/QtCore \ -I$(BUILD_PATH)/src/corelib/global -I$(BUILD_PATH)/src/corelib/xml \ -I$(SOURCE_PATH)/tools/shared \ -DQT_NO_PCRE \ |