[libmlocale] Remove crazy extra build-time dependencies on QtSvg/QtDB…

…us/etc.
sailfishos · Apr 9, 2013 · 3070d55 · 3070d55
1 parent 3291c5f
commit 3070d55
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 13 deletions.
diff --git a/benchmarks/common_top.pri b/benchmarks/common_top.pri
@@ -12,7 +12,7 @@ INCLUDEPATH += \
 DEPENDPATH = $$INCLUDEPATH
 QMAKE_LIBDIR += ../../lib
 CONFIG += debug
-QT += testlib dbus svg
+QT += testlib
 TEMPLATE = app
 # DEFINES += QT_NO_DEBUG_OUTPUT
 DEFINES += UNIT_TEST

diff --git a/configure b/configure
@@ -111,7 +111,7 @@ while [ "$#" -gt 0 ]; do
         VAL=no
         ;;
     #Qt style yes options
-        -h|-help|-v|-verbose|-debug|-release|-testable|-coverage|-timestamps|-dev|-minimal|-dbus|-icu|-gconf|-meegographicssystem|-shortcuts)
+        -h|-help|-v|-verbose|-debug|-release|-testable|-coverage|-timestamps|-dev|-minimal|-icu|-gconf|-meegographicssystem|-shortcuts)
         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
         VAL=yes
         ;;

diff --git a/src/common_top.pri b/src/common_top.pri
@@ -60,20 +60,10 @@ contains(M_BUILD_FEATURES, testable) {
 
 
 ## Dependencies
-
 contains(DEFINES, HAVE_ICU) {
     LIBS += -licui18n -licuuc -licudata
 }
 
-QT += \
-    svg \
-    network \
-    core \
-    gui \
-    xml
-
-!simulator: QT += opengl
-
 QMAKE_EXTRA_TARGETS += check
 check.depends = $$DESTDIR/lib$${TARGET}.so.$$VERSION
 check.commands = $$system(true)

diff --git a/src/src.pro b/src/src.pro
@@ -3,6 +3,7 @@ CONFIG += ordered
 DEFINES += M_BUILD_MLOCALE
 
 include(common_top.pri)
+QT += xml
 
 TARGET = mlocale
 

diff --git a/tests/common_top.pri b/tests/common_top.pri
@@ -15,7 +15,7 @@ DEPENDPATH = $$INCLUDEPATH
 QMAKE_LIBDIR += ../../lib /usr/local/lib
 CONFIG += debug
 CONFIG -= app_bundle
-QT += testlib dbus svg network
+QT += testlib
 TEMPLATE = app
 # DEFINES += QT_NO_DEBUG_OUTPUT
 DEFINES += UNIT_TEST