From: Kai Koehne Date: Fri, 30 Mar 2012 11:43:10 +0000 (+0200) Subject: Rename the 'declarative debug support' to 'qml debug support' X-Git-Tag: 071012110112~1913 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0556540b41c012712753d1ec79620b1b0ff1f17d;p=profile%2Fivi%2Fqtbase.git Rename the 'declarative debug support' to 'qml debug support' Since the library and almost everything got renamed to qml, we should do so for the debugging support, too. (CONFIG+=declarative_debug will continue to work for some time being, but prints a deprecated warning). Change-Id: I295155dce873e2585c1452d2bf0625ea6ce219c4 Reviewed-by: Oswald Buddenhagen --- diff --git a/configure b/configure index 99a5173..6103961 100755 --- a/configure +++ b/configure @@ -686,7 +686,7 @@ CFG_NOBUILD_PARTS="" CFG_RELEASE_QMAKE=no CFG_AUDIO_BACKEND=auto CFG_V8SNAPSHOT=auto -CFG_DECLARATIVE_DEBUG=yes +CFG_QML_DEBUG=yes CFG_JAVASCRIPTCORE_JIT=auto # Target architecture @@ -890,7 +890,7 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style yes options - -profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-eglfs|-nis|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-debug-and-release|-exceptions|-harfbuzz|-prefix-install|-silent|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-phonon-backend|-audio-backend|-declarative-debug|-javascript-jit|-rpath|-force-pkg-config|-icu|-force-asserts|-testcocoon) + -profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-eglfs|-nis|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-debug-and-release|-exceptions|-harfbuzz|-prefix-install|-silent|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-phonon-backend|-audio-backend|-qml-debug|-javascript-jit|-rpath|-force-pkg-config|-icu|-force-asserts|-testcocoon) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` VAL=yes ;; @@ -1763,12 +1763,12 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - declarative-debug) + qml-debug) if [ "$VAL" = "yes" ]; then - CFG_DECLARATIVE_DEBUG="yes" + CFG_QML_DEBUG="yes" else if [ "$VAL" = "no" ]; then - CFG_DECLARATIVE_DEBUG="no" + CFG_QML_DEBUG="no" else UNKNOWN_OPT=yes fi @@ -2941,7 +2941,7 @@ Usage: $relconf [-h] [-prefix ] [-prefix-install] [-bindir ] [-libdir [-qtnamespace ] [-qtlibinfix ] [-separate-debug-info] [-no-phonon-backend] [-phonon-backend] [-no-media-backend] [-media-backend] [-no-audio-backend] [-audio-backend] - [-no-javascript-jit] [-javascript-jit] [-no-declarative-debug] [-declarative-debug] + [-no-javascript-jit] [-javascript-jit] [-no-qml-debug] [-qml-debug] [-no-optimized-qmake] [-optimized-qmake] [-no-openssl] [-openssl] [-openssl-linked] [-no-gtkstyle] [-gtkstyle] @@ -3055,8 +3055,8 @@ Configure options: -no-javascript-jit . Do not build the JavaScriptCore JIT compiler. + -javascript-jit .... Build the JavaScriptCore JIT compiler. - -no-declarative-debug ..... Do not build the declarative debugging support. - + -declarative-debug ....... Build the declarative debugging support. + -no-qml-debug ...... Do not build the in-process QML debugging support. + + -qml-debug ......... Build the QML debugging support. -platform target ... The operating system and compiler you are building on ($PLATFORM). @@ -5407,8 +5407,8 @@ if [ "$CFG_V8SNAPSHOT" = "yes" ]; then fi # ### Vestige -if [ "$CFG_DECLARATIVE_DEBUG" = "no" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QDECLARATIVE_NO_DEBUG_PROTOCOL" +if [ "$CFG_QML_DEBUG" = "no" ]; then + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QML_NO_DEBUGGER" fi if [ "$CFG_EXCEPTIONS" = "no" ]; then @@ -5938,7 +5938,7 @@ if [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then else echo "JavaScriptCore JIT ..... $CFG_JAVASCRIPTCORE_JIT" fi -echo "Declarative debugging ...$CFG_DECLARATIVE_DEBUG" +echo "QML debugging .......... $CFG_QML_DEBUG" echo "STL support ............ $CFG_STL" echo "PCH support ............ $CFG_PRECOMPILE" if [ "$CFG_ARCH" = "i386" -o "$CFG_ARCH" = "x86_64" ]; then diff --git a/mkspecs/features/declarative_debug.prf b/mkspecs/features/declarative_debug.prf index 59e45f6..9125fcf 100644 --- a/mkspecs/features/declarative_debug.prf +++ b/mkspecs/features/declarative_debug.prf @@ -1 +1,2 @@ DEFINES += QT_DECLARATIVE_DEBUG +warning("CONFIG+=declarative_debug is deprecated. Use qml_debug instead!") diff --git a/mkspecs/features/qml_debug.prf b/mkspecs/features/qml_debug.prf new file mode 100644 index 0000000..72f4f22 --- /dev/null +++ b/mkspecs/features/qml_debug.prf @@ -0,0 +1 @@ +DEFINES += QT_QML_DEBUG diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 6ed419d..a9f3882 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -215,7 +215,7 @@ Configure::Configure(int& argc, char** argv) dictionary[ "WMSDK" ] = "auto"; dictionary[ "DIRECTSHOW" ] = "no"; dictionary[ "V8SNAPSHOT" ] = "auto"; - dictionary[ "DECLARATIVE_DEBUG" ]= "yes"; + dictionary[ "QML_DEBUG" ] = "yes"; dictionary[ "PLUGIN_MANIFESTS" ] = "yes"; dictionary[ "DIRECTWRITE" ] = "no"; @@ -845,10 +845,10 @@ void Configure::parseCmdLine() dictionary[ "PHONON_BACKEND" ] = "yes"; } else if (configCmdLine.at(i) == "-phonon-wince-ds9") { dictionary[ "DIRECTSHOW" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-declarative-debug") { - dictionary[ "DECLARATIVE_DEBUG" ] = "no"; - } else if (configCmdLine.at(i) == "-declarative-debug") { - dictionary[ "DECLARATIVE_DEBUG" ] = "yes"; + } else if (configCmdLine.at(i) == "-no-qml-debug") { + dictionary[ "QML_DEBUG" ] = "no"; + } else if (configCmdLine.at(i) == "-qml-debug") { + dictionary[ "QML_DEBUG" ] = "yes"; } else if (configCmdLine.at(i) == "-no-plugin-manifests") { dictionary[ "PLUGIN_MANIFESTS" ] = "no"; } else if (configCmdLine.at(i) == "-plugin-manifests") { @@ -1638,8 +1638,8 @@ bool Configure::displayHelp() desc("PHONON_BACKEND","yes","-phonon-backend", "Compile in the platform-specific Phonon backend-plugin"); desc("AUDIO_BACKEND", "no","-no-audio-backend", "Do not compile in the platform audio backend into QtMultimedia"); desc("AUDIO_BACKEND", "yes","-audio-backend", "Compile in the platform audio backend into QtMultimedia"); - desc("DECLARATIVE_DEBUG", "no", "-no-declarative-debug", "Do not build the declarative debugging support"); - desc("DECLARATIVE_DEBUG", "yes", "-declarative-debug", "Build the declarative debugging support"); + desc("QML_DEBUG", "no", "-no-qml-debug", "Do not build the QML debugging support"); + desc("QML_DEBUG", "yes", "-qml-debug", "Build the QML debugging support"); desc("DIRECTWRITE", "no", "-no-directwrite", "Do not build support for DirectWrite font rendering"); desc("DIRECTWRITE", "yes", "-directwrite", "Build support for DirectWrite font rendering (experimental, requires DirectWrite availability on target systems, e.g. Windows Vista with Platform Update, Windows 7, etc.)"); @@ -1999,8 +1999,8 @@ void Configure::autoDetection() dictionary["DBUS"] = checkAvailability("DBUS") ? "yes" : "no"; if (dictionary["V8SNAPSHOT"] == "auto") dictionary["V8SNAPSHOT"] = (dictionary["V8"] == "yes") && checkAvailability("V8SNAPSHOT") ? "yes" : "no"; - if (dictionary["DECLARATIVE_DEBUG"] == "auto") - dictionary["DECLARATIVE_DEBUG"] = dictionary["DECLARATIVE"] == "yes" ? "yes" : "no"; + if (dictionary["QML_DEBUG"] == "auto") + dictionary["QML_DEBUG"] = dictionary["QML"] == "yes" ? "yes" : "no"; if (dictionary["AUDIO_BACKEND"] == "auto") dictionary["AUDIO_BACKEND"] = checkAvailability("AUDIO_BACKEND") ? "yes" : "no"; if (dictionary["WMSDK"] == "auto") @@ -2838,7 +2838,7 @@ void Configure::generateConfigfiles() } if (dictionary["OPENSSL"] == "linked") qconfigList += "QT_LINKED_OPENSSL"; if (dictionary["DBUS"] == "no") qconfigList += "QT_NO_DBUS"; - if (dictionary["DECLARATIVE_DEBUG"] == "no") qconfigList += "QDECLARATIVE_NO_DEBUG_PROTOCOL"; + if (dictionary["QML_DEBUG"] == "no") qconfigList += "QT_QML_NO_DEBUGGER"; if (dictionary["FREETYPE"] == "no") qconfigList += "QT_NO_FREETYPE"; if (dictionary["NATIVE_GESTURES"] == "no") qconfigList += "QT_NO_NATIVE_GESTURES"; @@ -3061,7 +3061,7 @@ void Configure::displayConfig() cout << "OpenSSL support............." << dictionary[ "OPENSSL" ] << endl; cout << "QtDBus support.............." << dictionary[ "DBUS" ] << endl; cout << "QtWidgets module support...." << dictionary[ "WIDGETS" ] << endl; - cout << "Declarative debugging......." << dictionary[ "DECLARATIVE_DEBUG" ] << endl; + cout << "QML debugging..............." << dictionary[ "QML_DEBUG" ] << endl; cout << "DirectWrite support........." << dictionary[ "DIRECTWRITE" ] << endl << endl; cout << "Third Party Libraries:" << endl;