diff options
author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-26 13:17:08 (GMT) |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-26 13:17:08 (GMT) |
commit | b0390e68893dd04076434695be5e676b87bc067c (patch) | |
tree | 60543fd8cf8c72f530a8865fa8fc2306bb52b9ba /src/gui/gui.pro | |
parent | 537312d5dea24bd404666789119a5ad1bab04396 (diff) | |
parent | 57a4353c8e082dfc0f536a1e642e4a8df0e5b9c9 (diff) | |
download | Qt-b0390e68893dd04076434695be5e676b87bc067c.zip Qt-b0390e68893dd04076434695be5e676b87bc067c.tar.gz Qt-b0390e68893dd04076434695be5e676b87bc067c.tar.bz2 |
Merge branch 'master' into lighthouse-master
Diffstat (limited to 'src/gui/gui.pro')
-rw-r--r-- | src/gui/gui.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 11a25e2..fe1a595 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -7,7 +7,7 @@ irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused !win32:!embedded:!qpa:!mac:!symbian:CONFIG += x11 -unix:QMAKE_PKGCONFIG_REQUIRES = QtCore +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore include(../qbase.pri) |