move designer tool to tools sub-directory and update translations

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

mkspecs/mkspecs.cmake

@@ -10,7 +10,7 @@ set(KATIE_BUGREPORT "xakepa10@gmail.com")
 set(KATIE_URL "http://github.com/fluxer/katie")
 set(KATIE_COMPONENTS "Core Gui DBus Declarative Designer DesignerComponents Help Multimedia Network OpenGL Phonon Sql Svg Xml XmlPatterns Script ScriptTools Test UiTools")
 # TODO: make dbus tools optional
-set(KATIE_TOOLS "moc uic rcc qdbusxml2cpp qdbuscpp2xml qhelpgenerator qcollectiongenerator lupdate lrelease lconvert")
+set(KATIE_TOOLS "moc uic rcc qdbusxml2cpp qdbuscpp2xml qhelpgenerator qcollectiongenerator lupdate lrelease lconvert designer")
 set(QT_LICENSE "Open Source")
 set(QT_PRODUCT "AwesomeSauce") # it's not a bug, it's a feature!
 

scripts/updatetranslations.py

@@ -3,9 +3,10 @@
 import os, glob, subprocess, shlex
 
 components = ('core', 'declarative', 'gui', 'multimedia', 'network', 'opengl',
-    'plugins', 'script', 'scripttools', 'sql', 'svg', 'xml', 'xmlpatterns')
+    'plugins', 'script', 'scripttools', 'sql', 'svg', 'xml', 'xmlpatterns',
+    'designer')
 tools = ('lrelease', 'uic', 'moc', 'lupdate', 'idc', 'qcollectiongenerator',
-    'rcc', 'lconvert', 'qhelpgenerator', 'qdbus')
+    'rcc', 'lconvert', 'qhelpgenerator', 'qdbus', '../designer/designer')
 cfiles = []
 tfiles = []
 

src/designer/CMakeLists.txt

@@ -9,7 +9,6 @@ include(sdk/sdk.cmake)
 include(shared/shared.cmake)
 
 add_subdirectory(components)
-add_subdirectory(designer)
 
 set(DESIGNER_PUBLIC_HEADERS
     ${DESIGNER_PUBLIC_HEADERS}

src/tools/CMakeLists.txt

@@ -16,4 +16,5 @@ if(NOT KATIE_BOOTSTRAP)
     endif()
     add_subdirectory(qhelpgenerator)
     add_subdirectory(qcollectiongenerator)
+    add_subdirectory(designer)
 endif()

src/tools/designer/qdesigner.cpp

@@ -223,7 +223,7 @@ void QDesigner::initialize()
     QTranslator *qtTranslator = new QTranslator(this);
 
     const QString localSysName = QLocale::system().name();
-    QString  translatorFileName = QLatin1String("designer_");
+    QString  translatorFileName = QLatin1String("qt_tools_");
     translatorFileName += localSysName;
     translator->load(translatorFileName, resourceDir);