[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeadmin
From:       Dirk Mueller <mueller () kde ! org>
Date:       2003-05-01 23:03:45
[Download RAW message or body]

CVS commit by mueller: 

- use KDE_DEFAULT_CXXFLAGS
- fix compilation


  M +1 -1      configure.in.in   1.33
  M +3 -3      kcmlinuz/configparser.cpp   1.29


--- kdeadmin/configure.in.in  #1.32:1.33
@@ -4,5 +4,5 @@
 AC_CHECK_UNSETENV
 
-CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST"
+CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
 
 AC_CHECK_HEADERS(sys/stropts.h stropts.h)

--- kdeadmin/kcmlinuz/configparser.cpp  #1.28:1.29
@@ -440,9 +440,9 @@ Parser::Parser()
         uname(&info); // Determine architecture default from uname()
         m_arch = info.machine;
-        if (QRegExp("i.86").match(m_arch) != -1)
+        if (QRegExp("i.86").search(m_arch) != -1)
                 m_arch = "i386";
         else if (m_arch == "sun4u")
                 m_arch = "sparc64";
-        else if (QRegExp("arm.*").match(m_arch) != -1)
+        else if (QRegExp("arm.*").search(m_arch) != -1)
                 m_arch = "arm";
         else if (m_arch == "sa110")


[prev in list] [next in list] [prev in thread] [next in thread]