diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-30 11:51:17 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-30 11:51:20 +0200 |
| commit | 42f2da5e6b543e698fc4f036c45ebb15078409c8 (patch) | |
| tree | 2d688b1a812d8410d4ae85283d5e413957000e11 /config.tests | |
| parent | e9962cc300a805ce09a02ce0c9ae23ceaf8073bb (diff) | |
| parent | 009f3d14045e2e2a6eff8c87a8da9eaa621c5249 (diff) | |
| download | qtbase-42f2da5e6b543e698fc4f036c45ebb15078409c8.tar.gz | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
src/src.pro
Change-Id: Ic04fb170b82e86dc3cef6fe979f8fb709db10daf
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/x11/fontconfig/fontconfig.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config.tests/x11/fontconfig/fontconfig.pro b/config.tests/x11/fontconfig/fontconfig.pro index 718a8204bc..8360774035 100644 --- a/config.tests/x11/fontconfig/fontconfig.pro +++ b/config.tests/x11/fontconfig/fontconfig.pro @@ -1,5 +1,4 @@ SOURCES = fontconfig.cpp -CONFIG += x11 CONFIG -= qt LIBS += -lfreetype -lfontconfig include(../../unix/freetype/freetype.pri) |