From 1ff5a776e83a2489bbf32d0628b410ce439b92b3 Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Wed, 16 May 2012 10:49:46 +0200 Subject: [PATCH] Remove src/widgets/kernel/x11.pri. Presumably, this was set for QSound, which has since moved to QtMultimedia (and no longer uses nas, anyway). Configure also no longer seems to have logic for setting nas, as of 4535913c4fb908293f8f1667eff480efc3fadd73. Change-Id: Ie5b351844bd169ad0548b0d29513adbf6f5d9a12 Reviewed-by: Oswald Buddenhagen Reviewed-by: Giuseppe D'Angelo Reviewed-by: Donald Carr Reviewed-by: Girish Ramakrishnan --- src/widgets/kernel/x11.pri | 4 ---- src/widgets/widgets.pro | 1 - 2 files changed, 5 deletions(-) delete mode 100644 src/widgets/kernel/x11.pri diff --git a/src/widgets/kernel/x11.pri b/src/widgets/kernel/x11.pri deleted file mode 100644 index 82de1b6..0000000 --- a/src/widgets/kernel/x11.pri +++ /dev/null @@ -1,4 +0,0 @@ -x11 { - contains(QT_CONFIG, nas): LIBS_PRIVATE += -laudio -lXt -} - diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index 4e46ffc..4eb9634 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -23,7 +23,6 @@ include(../qbase.pri) contains(QT_CONFIG, x11sm):CONFIG += x11sm #platforms -x11:include(kernel/x11.pri) mac:include(kernel/mac.pri) win32:include(kernel/win.pri) -- 2.7.4