aboutsummaryrefslogtreecommitdiff
path: root/mkspecs
diff options
context:
space:
mode:
authorHannu Koivisto <hannu.koivisto@vincit.fi>2010-10-14 17:11:44 +0300
committerPekka Vuorela <pekka.ta.vuorela@nokia.com>2010-10-19 14:37:21 +0300
commitd3f6b6a0981a948e4eb9abba01af2ef0ba2f682e (patch)
tree6dd528fbf35cbd41a987c3aaeb3ca17730df69da /mkspecs
parentc7cde8c7382365acff2a203a52db0ee3c329a8aa (diff)
Fixes: MRichTextEdit toolbar file location
RevBy: Pekka Vuorela Details: the path was hardwired so the file could not be found if a non-default prefix was used to build the library.
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/common.pri3
-rw-r--r--mkspecs/features/meegotouch_defines.prf.in4
2 files changed, 7 insertions, 0 deletions
diff --git a/mkspecs/common.pri b/mkspecs/common.pri
index 84208cec..fe5ba299 100644
--- a/mkspecs/common.pri
+++ b/mkspecs/common.pri
@@ -87,6 +87,9 @@ include($${M_BUILD_TREE}/mkspecs/features/meegotouch_defines.prf)
# M_TARGETS_CONF_DIR defines the location of target device config files
DEFINES += M_TARGETS_CONF_DIR=\\\"\"$$M_TARGETS_CONF_DIR\"\\\"
+
+ # Input method toolbar definition location
+ DEFINES += M_IM_TOOLBARS_DIR=\\\"\"$$M_IM_TOOLBARS_DIR\"\\\"
}
unix {
diff --git a/mkspecs/features/meegotouch_defines.prf.in b/mkspecs/features/meegotouch_defines.prf.in
index 37518db3..59c3a353 100644
--- a/mkspecs/features/meegotouch_defines.prf.in
+++ b/mkspecs/features/meegotouch_defines.prf.in
@@ -60,6 +60,8 @@ unix|win32 {
M_SHADER_BINARY_DIR = $$M_INSTALL_LOCALSTATE/cache/meegotouch/shaders
M_TARGETS_CONF_DIR = $$M_INSTALL_DATA/meegotouch/targets
+
+ M_IM_TOOLBARS_DIR = $$M_INSTALL_DATA/meegotouch/imtoolbars
}
mac {
@@ -87,6 +89,8 @@ mac {
M_SHADER_BINARY_DIR = $$M_INSTALL_LOCALSTATE/cache/meegotouch/shaders
M_TARGETS_CONF_DIR = $$M_INSTALL_DATA/meegotouch/targets
+
+ M_IM_TOOLBARS_DIR = $$M_INSTALL_DATA/meegotouch/imtoolbars
}
win32 {