| -rw-r--r-- | mkspecs/qws/linux-generic-g++/qmake.conf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf index 7a12e98..7de487d 100644 --- a/mkspecs/qws/linux-generic-g++/qmake.conf +++ b/mkspecs/qws/linux-generic-g++/qmake.conf | |||
| @@ -9,5 +9,5 @@ TEMPLATE = app | |||
| 9 | CONFIG += qt link_prl | 9 | CONFIG += qt link_prl |
| 10 | 10 | ||
| 11 | QMAKE_CC = $(CCACHE) gcc | 11 | QMAKE_CC = $(CCACHE) $(DISTCC) gcc |
| 12 | QMAKE_LEX = flex | 12 | QMAKE_LEX = flex |
| 13 | QMAKE_LEXFLAGS = | 13 | QMAKE_LEXFLAGS = |
| @@ -23,5 +23,5 @@ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses | |||
| 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 23 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
| 24 | 24 | ||
| 25 | QMAKE_CXX = $(CCACHE) g++ | 25 | QMAKE_CXX = $(CCACHE) $(DISTCC) g++ |
| 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) | 26 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) |
| 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 27 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
| @@ -35,6 +35,6 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD | |||
| 35 | QMAKE_INCDIR = | 35 | QMAKE_INCDIR = |
| 36 | QMAKE_LIBDIR = | 36 | QMAKE_LIBDIR = |
| 37 | QMAKE_INCDIR_X11= | 37 | QMAKE_INCDIR_X11= |
| 38 | QMAKE_LIBDIR_X11= | 38 | QMAKE_LIBDIR_X11= |
| 39 | QMAKE_INCDIR_QT = $(QTDIR)/include | 39 | QMAKE_INCDIR_QT = $(QTDIR)/include |
| 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 40 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
| @@ -57,6 +57,6 @@ QMAKE_RPATH = -Wl,-rpath, | |||
| 57 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
| 58 | QMAKE_LIBS_DYNLOAD = -ldl | 58 | QMAKE_LIBS_DYNLOAD = -ldl |
| 59 | QMAKE_LIBS_X11 = | 59 | QMAKE_LIBS_X11 = |
| 60 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
| 61 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
| 62 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 62 | QMAKE_LIBS_QT_THREAD = -lqte-mt |