diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
| commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
| tree | 9981f274712c098cabbff0c4667672a3934e5393 /mkspecs/qws/linux-nacl-g++/qmake.conf | |
| parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
| parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) | |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'mkspecs/qws/linux-nacl-g++/qmake.conf')
| -rw-r--r-- | mkspecs/qws/linux-nacl-g++/qmake.conf | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/mkspecs/qws/linux-nacl-g++/qmake.conf b/mkspecs/qws/linux-nacl-g++/qmake.conf deleted file mode 100644 index 7293a1acfd..0000000000 --- a/mkspecs/qws/linux-nacl-g++/qmake.conf +++ /dev/null @@ -1,29 +0,0 @@ -# -# qmake configuration for building with nacl-g++ -# - -include(../../common/linux.conf) -include(../../common/qws.conf) -include(../../common/gcc-base-unix.conf) -include(../../common/g++-unix.conf) - -QT = core gui - -QMAKE_CC = nacl-gcc -QMAKE_CXX = nacl-g++ -QMAKE_LINK = nacl-g++ -QMAKE_LINK_SHLIB = nacl-g++ -QMAKE_AR = nacl-ar q -QMAKE_OBJCOPY = nacl-objcopy -QMAKE_STRIP = nacl-strip - -# work around linker crash when using PIC -QMAKE_CFLAGS_STATIC_LIB -= -fPIC -QMAKE_CFLAGS_SHLIB -= -fPIC -QMAKE_CXXFLAGS_STATIC_LIB -= -fPIC -QMAKE_CXXFLAGS_SHLIB -= -fPIC - -#QMAKE_CFLAGS += -pipe -DXP_UNIX -DNACL_STANDALONE=1 -QMAKE_LIBS_DYNLOAD -= -ldl - -load(qt_config) |