From: GiWoong Kim <giwoong.kim@samsung.com>
Date: Tue, 14 Apr 2015 04:58:25 +0000 (+0900)
Subject: build: add Qt library linking
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~503^2~10^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=63355fb02fe45fe2ee2a4d139fdf5b0122edfdd7;p=sdk%2Femulator%2Fqemu.git

build: add Qt library linking

Change-Id: I430327b14b7fdccfb7187112f4f1a5b15da55371
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
---

diff --git a/configure b/configure
index d9295eff19..cc4cf9367e 100755
--- a/configure
+++ b/configure
@@ -2197,7 +2197,7 @@ fi
 qtversion=""
 if test "$qt" != "no"; then
     if test "$qtabi" = "5.0" ; then
-        qtpackage="Qt5Widgets Qt5Qml Qt5OpenGL Qt5Gui"
+        qtpackage="Qt5Widgets Qt5OpenGL Qt5Gui"
         qtversion="5.0.0"
 
         if $pkg_config --exists "$qtpackage >= $qtversion"; then
diff --git a/package/build.macos-64 b/package/build.macos-64
index f4d08d7775..f0e9747209 100755
--- a/package/build.macos-64
+++ b/package/build.macos-64
@@ -25,7 +25,10 @@ prepare()
         exit 1
     fi
 
-    export PKG_CONFIG_PATH=$ROOTDIR/glib2/lib/pkgconfig:$ROOTDIR/curl/lib/pkgconfig:$ROOTDIR/libffi/lib/pkgconfig:$ROOTDIR/libidn/lib/pkgconfig:$ROOTDIR/libxml2/lib/pkgconfig:$ROOTDIR/ncurses/lib/pkgconfig:$ROOTDIR/openssl/lib/pkgconfig:$ROOTDIR/pixman/lib/pkgconfig:$ROOTDIR/zlib/lib/pkgconfig:$ROOTDIR/libav/lib/pkgconfig:$ROOTDIR/libpng/lib/pkgconfig:$ROOTDIR/x264/lib/pkgconfig:$PKG_CONFIG_PATH
+    PATH=$PATH:$ROOTDIR/Qt_5.3.1/bin
+    export PATH
+
+    export PKG_CONFIG_PATH=$ROOTDIR/glib2/lib/pkgconfig:$ROOTDIR/curl/lib/pkgconfig:$ROOTDIR/libffi/lib/pkgconfig:$ROOTDIR/libidn/lib/pkgconfig:$ROOTDIR/libxml2/lib/pkgconfig:$ROOTDIR/ncurses/lib/pkgconfig:$ROOTDIR/openssl/lib/pkgconfig:$ROOTDIR/pixman/lib/pkgconfig:$ROOTDIR/zlib/lib/pkgconfig:$ROOTDIR/libav/lib/pkgconfig:$ROOTDIR/libpng/lib/pkgconfig:$ROOTDIR/x264/lib/pkgconfig:$ROOTDIR/Qt_5.3.1/lib/pkgconfig:$PKG_CONFIG_PATH
 
     BUILD_CFLAGS="--extra-cflags=-I$ROOTDIR/libiconv/include "
     BUILD_LDFLAGS="--extra-ldflags=-L$ROOTDIR/libiconv/lib "
diff --git a/package/build.windows-32 b/package/build.windows-32
index 63f6dd4bd7..60b1287a25 100755
--- a/package/build.windows-32
+++ b/package/build.windows-32
@@ -34,14 +34,14 @@ prepare()
 	fi
 
 	PURIFIED_ROOTDIR=${MSYS_ROOTDIR}
-	PATH=$PATH:$PURIFIED_ROOTDIR/bin:$PURIFIED_ROOTDIR/apache-ant_1.9.2/bin:$PURIFIED_ROOTDIR/SDL_1.2.15/bin:$PURIFIED_ROOTDIR/pixman_0.30.0/bin:$PURIFIED_ROOTDIR/gtk-bundle_2.24.10/bin:$PURIFIED_ROOTDIR/libcurl-4_1.0.1/bin
+	PATH=$PATH:$PURIFIED_ROOTDIR/bin:$PURIFIED_ROOTDIR/apache-ant_1.9.2/bin:$PURIFIED_ROOTDIR/SDL_1.2.15/bin:$PURIFIED_ROOTDIR/pixman_0.30.0/bin:$PURIFIED_ROOTDIR/gtk-bundle_2.24.10/bin:$PURIFIED_ROOTDIR/libcurl-4_1.0.1/bin:$PURIFIED_ROOTDIR/Qt_5.3.1/bin
 	export PATH
 
 	if [ -z ${PKG_CONFIG_PATH} ]
 	then
-		PKG_CONFIG_PATH=$PURIFIED_ROOTDIR/libav/lib/pkgconfig:$PURIFIED_ROOTDIR/SDL_1.2.15/lib/pkgconfig:$PURIFIED_ROOTDIR/pixman_0.30.0/lib/pkgconfig:$PURIFIED_ROOTDIR/gtk-bundle_2.24.10/lib/pkgconfig:$PURIFIED_ROOTDIR/libcurl-4_1.0.1/lib/pkgconfig:$PURIFIED_ROOTDIR/x264/lib/pkgconfig
+		PKG_CONFIG_PATH=$PURIFIED_ROOTDIR/libav/lib/pkgconfig:$PURIFIED_ROOTDIR/SDL_1.2.15/lib/pkgconfig:$PURIFIED_ROOTDIR/pixman_0.30.0/lib/pkgconfig:$PURIFIED_ROOTDIR/gtk-bundle_2.24.10/lib/pkgconfig:$PURIFIED_ROOTDIR/libcurl-4_1.0.1/lib/pkgconfig:$PURIFIED_ROOTDIR/x264/lib/pkgconfig:$PURIFIED_ROOTDIR/Qt_5.3.1/lib/pkgconfig
 	else
-		PKG_CONFIG_PATH=$PURIFIED_ROOTDIR/libav/lib/pkgconfig:$PURIFIED_ROOTDIR/SDL_1.2.15/lib/pkgconfig:$PURIFIED_ROOTDIR/pixman_0.30.0/lib/pkgconfig:$PURIFIED_ROOTDIR/gtk-bundle_2.24.10/lib/pkgconfig:$PURIFIED_ROOTDIR/libcurl-4_1.0.1/lib/pkgconfig:$PURIFIED_ROOTDIR/x264/lib/pkgconfig:${PKG_CONFIG_PATH}
+		PKG_CONFIG_PATH=$PURIFIED_ROOTDIR/libav/lib/pkgconfig:$PURIFIED_ROOTDIR/SDL_1.2.15/lib/pkgconfig:$PURIFIED_ROOTDIR/pixman_0.30.0/lib/pkgconfig:$PURIFIED_ROOTDIR/gtk-bundle_2.24.10/lib/pkgconfig:$PURIFIED_ROOTDIR/libcurl-4_1.0.1/lib/pkgconfig:$PURIFIED_ROOTDIR/x264/lib/pkgconfig:$PURIFIED_ROOTDIR/Qt_5.3.1/lib/pkgconfig:${PKG_CONFIG_PATH}
 	fi
 	export PKG_CONFIG_PATH
 
diff --git a/vl.c b/vl.c
index 4e025ce506..22e4ee4eeb 100644
--- a/vl.c
+++ b/vl.c
@@ -2212,6 +2212,8 @@ static DisplayType select_display(const char *p)
         display = DT_MARU_QT;
 # else
         fprintf(stderr, "maru_qt is disabled\n");
+
+        maru_register_exit_msg(MARU_EXIT_UNKNOWN, "maru_qt is disabled");
         exit(1);
 # endif
 #endif /* CONFIG_MARU */