silence re_syntax.n warning

author: das <das> 2006-04-12 02:20:16 (GMT)
committer: das <das> 2006-04-12 02:20:16 (GMT)
commit: c4cf4ed274cdbd0f8e272961e2f10b022d8c30cc (patch)
tree: 74383987ab0ed93d721cf661033c5bf562d77bc2 /tools
parent: ae9fb6b9eec7da538d2413f60b7433b1aa141aa9 (diff)
download: tcl-c4cf4ed274cdbd0f8e272961e2f10b022d8c30cc.zip
tcl-c4cf4ed274cdbd0f8e272961e2f10b022d8c30cc.tar.gz
tcl-c4cf4ed274cdbd0f8e272961e2f10b022d8c30cc.tar.bz2
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index db24a9a..ae9d68f 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -1188,6 +1188,7 @@ proc output-directive {line} {
 		{expr:MATH FUNCTIONS} -
 		{history:DESCRIPTION} -
 		{history:HISTORY REVISION} -
+		{re_syntax:BRACKET EXPRESSIONS} -
 		{switch:DESCRIPTION} -
 		{upvar:DESCRIPTION} {
 		    return;			# fix.me
diff --git a/config.tests/unix/icd/icd.cpp b/config.tests/unix/icd/icd.cpp
index e3701ac..8b74fd6 100644
--- a/config.tests/unix/icd/icd.cpp
+++ b/config.tests/unix/icd/icd.cpp
@@ -42,14 +42,12 @@
 #include <libicd-network-wlan-dev.h>
 #include <maemo_icd.h>
 #include <iapconf.h>
-//#include <proxyconf.h>
+#include <proxyconf.h>
+#include <wlancond.h>
+#include <iapmonitor.h>
 #include <icd/dbus_api.h>
 
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
 int main(int, char **)
 {
-    dbus_shutdown();
     return 0;
 }
diff --git a/configure b/configure
index a78e9ac..0bfa880 100755
--- a/configure
+++ b/configure
@@ -5236,25 +5236,47 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
     if [ "$CFG_GLIB" = "yes" -a "$CFG_ICD" != "no" ]; then
         # ICD support has a cyclic dependency on Qt.
         if [ -n "$PKG_CONFIG" ]; then
-            QT_CFLAGS_ICD=`$PKG_CONFIG --cflags dbus-glib-1 gconf-2.0 osso-ic conninet 2>/dev/null`
-            QT_LIBS_ICD=`$PKG_CONFIG --libs dbus-glib-1 gconf-2.0 osso-ic conninet 2>/dev/null`
+            QT_CFLAGS_ICD=`$PKG_CONFIG --cflags osso-ic conninet 2>/dev/null`
+            QT_LIBS_ICD=`$PKG_CONFIG --libs osso-ic conninet 2>/dev/null`
             QT_CFLAGS_QTNETWORK=`$PKG_CONFIG --cflags QtNetwork 2>/dev/null`
             QT_LIBS_QTNETWORK=`$PKG_CONFIG --libs QtNetwork 2>/dev/null`
         else
-            QT_CFLAGS_QTNETOWRK=
+            QT_CFLAGS_QTNETWORK=
             QT_LIBS_QTNETWORK=
         fi
         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/icd "ICD" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_ICD $QT_LIBS_ICD $QT_CFLAGS_QTNETWORK $QT_LIBS_QTNETWORK; then
             [ "$CFG_ICD" = "auto" ] && CFG_ICD=yes
-            QMakeVar set QT_CFLAGS_ICD "$QT_CFLAGS_ICD"
-            QMakeVar set QT_LIBS_ICD "$QT_LIBS_ICD"
+            # remove system Qt includes and libraries
+            QT_CFLAGS_ICD_TRIMMED=
+            for i in $QT_CFLAGS_ICD; do
+                case $i in
+                    *qt*)
+                        ;;
+                    *)
+                        QT_CFLAGS_ICD_TRIMMED="$QT_CFLAGS_ICD_TRIMMED $i"
+                        ;;
+                esac
+            done
+            QT_LIBS_ICD_TRIMMED=
+            for i in $QT_LIBS_ICD; do
+                case $i in
+                    *qt*|-lQt*)
+                        ;;
+                    *)
+                        QT_LIBS_ICD_TRIMMED="$QT_LIBS_ICD_TRIMMED $i"
+                        ;;
+                esac
+            done
+
+            QMakeVar set QT_CFLAGS_ICD "$QT_CFLAGS_ICD_TRIMMED"
+            QMakeVar set QT_LIBS_ICD "$QT_LIBS_ICD_TRIMMED"
         else
             if [ "$CFG_ICD" = "auto" ]; then
                 CFG_ICD=no
             elif [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
                 # CFG_ICD is "yes"
 
-                echo "The ICD Bearer Management plugin cannot be enabled because dbus-glib-1, gconf-2.0, osso-ic or conninet was not found."
+                echo "The ICD Bearer Management plugin cannot be enabled because osso-ic or conninet was not found."
                 echo " Turn on verbose messaging (-v) to $0 to see the final report."
                 echo " If you believe this message is in error you may use the continue"
                 echo " switch (-continue) to $0 to continue."
@@ -7980,8 +8002,10 @@ if [ "$CFG_OPENSSL" = "linked" ] && [ "$OPENSSL_LIBS" = "" ]; then
 fi
 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_DEBUG" = "yes" ] && [ "$CFG_DEBUG_RELEASE" = "no" ]; then
     echo
-    echo "NOTE: Mac OS X frameworks implicitly build debug and release Qt libraries."
+    echo "Error: debug-only framework builds are not supported. Configure with -no-framework"
+    echo "if you want a pure debug build."
     echo
+    exit 1
 fi
 
 sepath=`echo "$relpath" | sed -e 's/\\./\\\\./g'`
diff --git a/demos/declarative/calculator/calculator.qmlproject b/demos/declarative/calculator/calculator.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/demos/declarative/calculator/calculator.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/demos/declarative/demos.qmlproject b/demos/declarative/demos.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/demos/declarative/demos.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/demos/declarative/flickr/common/LikeOMeter.qml b/demos/declarative/flickr/common/LikeOMeter.qml
deleted file mode 100644
index 17e3998..0000000
--- a/demos/declarative/flickr/common/LikeOMeter.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: container
-
-    property int rating: 2
-
-    Row {
-        Star {
-            rating: 0
-            onClicked: { container.rating = rating }
-            on: container.rating >= 0
-        }
-        Star {
-            rating: 1
-            onClicked: { container.rating = rating }
-            on: container.rating >= 1
-        }
-        Star {
-            rating: 2
-            onClicked: { container.rating = rating }
-            on: container.rating >= 2
-        }
-        Star {
-            rating: 3
-            onClicked: { container.rating = rating }
-            on: container.rating >= 3
-        }
-        Star {
-            rating: 4
-            onClicked: { container.rating = rating }
-            on: container.rating >= 4
-        }
-    }
-}
diff --git a/demos/declarative/flickr/common/Loading.qml b/demos/declarative/flickr/common/Loading.qml
deleted file mode 100644
index 8daed48..0000000
--- a/demos/declarative/flickr/common/Loading.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import Qt 4.7
-
-Image {
-    id: loading; source: "pics/loading.png"
-    NumberAnimation on rotation {
-        from: 0; to: 360; running: loading.visible == true; loops: Animation.Infinite; duration: 900
-    }
-}
diff --git a/demos/declarative/flickr/common/RssModel.qml b/demos/declarative/flickr/common/RssModel.qml
index d0960db..415a9e9 100644
--- a/demos/declarative/flickr/common/RssModel.qml
+++ b/demos/declarative/flickr/common/RssModel.qml
@@ -3,7 +3,12 @@ import Qt 4.7
 XmlListModel {
     property string tags : ""
 
-    source: "http://api.flickr.com/services/feeds/photos_public.gne?"+(tags ? "tags="+tags+"&" : "")+"format=rss2"
+    function commasep(x)
+    {
+        return x.replace(' ',',');
+    }
+
+    source: "http://api.flickr.com/services/feeds/photos_public.gne?"+(tags ? "tags="+commasep(tags)+"&" : "")+"format=rss2"
     query: "/rss/channel/item"
     namespaceDeclarations: "declare namespace media=\"http://search.yahoo.com/mrss/\";"
 
diff --git a/demos/declarative/flickr/common/Star.qml b/demos/declarative/flickr/common/Star.qml
deleted file mode 100644
index fcca742..0000000
--- a/demos/declarative/flickr/common/Star.qml
+++ /dev/null
@@ -1,45 +0,0 @@
-import Qt 4.7
-
-Item {
-    id: container
-    width: 24
-    height: 24
-
-    property int rating
-    property bool on
-    signal clicked
-
-    Image {
-        id: starImage
-        source: "pics/ghns_star.png"
-        x: 6
-        y: 7
-        opacity: 0.4
-        scale: 0.5
-    }
-    MouseArea {
-        anchors.fill: container
-        onClicked: { container.clicked() }
-    }
-    states: [
-        State {
-            name: "on"
-            when: container.on == true
-            PropertyChanges {
-                target: starImage
-                opacity: 1
-                scale: 1
-                x: 1
-                y: 0
-            }
-        }
-    ]
-    transitions: [
-        Transition {
-            NumberAnimation {
-                properties: "opacity,scale,x,y"
-                easing.type: "OutBounce"
-            }
-        }
-    ]
-}
diff --git a/demos/declarative/flickr/common/pics/background.png b/demos/declarative/flickr/common/pics/background.png
deleted file mode 100644
index 5b37072..0000000
--- a/demos/declarative/flickr/common/pics/background.png
+++ /dev/null
diff --git a/demos/declarative/flickr/common/pics/button-pressed.png b/demos/declarative/flickr/common/pics/button-pressed.png
deleted file mode 100644
index e434d32..0000000
--- a/demos/declarative/flickr/common/pics/button-pressed.png
+++ /dev/null
diff --git a/demos/declarative/flickr/common/pics/button-pressed.sci b/demos/declarative/flickr/common/pics/button-pressed.sci
deleted file mode 100644
index b8db272..0000000
--- a/demos/declarative/flickr/common/pics/button-pressed.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 8
-border.top: 4
-border.bottom: 4
-border.right: 8
-source: button.png
diff --git a/demos/declarative/flickr/common/pics/button.png b/demos/declarative/flickr/common/pics/button.png
deleted file mode 100644
index 56a63ce..0000000
--- a/demos/declarative/flickr/common/pics/button.png
+++ /dev/null
diff --git a/demos/declarative/flickr/common/pics/button.sci b/demos/declarative/flickr/common/pics/button.sci
deleted file mode 100644
index b8db272..0000000
--- a/demos/declarative/flickr/common/pics/button.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 8
-border.top: 4
-border.bottom: 4
-border.right: 8
-source: button.png
diff --git a/demos/declarative/flickr/common/pics/ghns_star.png b/demos/declarative/flickr/common/pics/ghns_star.png
deleted file mode 100644
index 4ad43cc..0000000
--- a/demos/declarative/flickr/common/pics/ghns_star.png
+++ /dev/null
diff --git a/demos/declarative/flickr/common/pics/loading.png b/demos/declarative/flickr/common/pics/loading.png
deleted file mode 100644
author	das <das>	2006-04-12 02:20:16 (GMT)
committer	das <das>	2006-04-12 02:20:16 (GMT)
commit	c4cf4ed274cdbd0f8e272961e2f10b022d8c30cc (patch)
tree	74383987ab0ed93d721cf661033c5bf562d77bc2 /tools
parent	ae9fb6b9eec7da538d2413f60b7433b1aa141aa9 (diff)
download	tcl-c4cf4ed274cdbd0f8e272961e2f10b022d8c30cc.zip tcl-c4cf4ed274cdbd0f8e272961e2f10b022d8c30cc.tar.gz tcl-c4cf4ed274cdbd0f8e272961e2f10b022d8c30cc.tar.bz2