← Back to branch summary

~ubuntu-branches/ubuntu/maverick/sip4-qt3/maverick

« back to all changes in this revision

Viewing changes to siputils.py

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-07-21 10:18:00 UTC
  • mfrom: (1.3.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20100721101800-9lk0k2t6hx6pq0dh
Tags: 4.10.5-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
siputils.py
582
582
                    "QtCore":       "LIBS_CORE",
583
583
                    "QtGui":        "LIBS_GUI",
584
584
                    "QtNetwork":    "LIBS_NETWORK",
585
 
                    "QtOpenGL":     "LIBS_OPENGL"
 
585
                    "QtOpenGL":     "LIBS_OPENGL",
 
586
                    "QtWebKit":     "LIBS_WEBKIT"
586
587
                }
587
588
 
588
589
                # For Windows: the dependencies between Qt libraries.
702
703
            libs.extend(self.optional_list("LIBS_OPENGL"))
703
704
 
704
705
        if self._qt or self._opengl:
705
 
            if self.config.qt_version < 0x040000 or "QtGui" in self._qt:
 
706
            if self.config.qt_version < 0x040000 or self._opengl or "QtGui" in self._qt:
706
707
                incdir.extend(self.optional_list("INCDIR_X11"))
707
708
                libdir.extend(self.optional_list("LIBDIR_X11"))
708
709
                libs.extend(self.optional_list("LIBS_X11"))
2312
2313
        if line and line[0] != "#":
2313
2314
            assstart = line.find("+")
2314
2315
            if assstart > 0 and line[assstart + 1] == '=':
 
2316
                adding = True
2315
2317
                assend = assstart + 1
2316
2318
            else:
 
2319
                adding = False
2317
2320
                assstart = line.find("=")
2318
2321
                assend = assstart
2319
2322
 
2324
2327
                # Remove the escapes for any quotes.
2325
2328
                rhs = rhs.replace(r'\"', '"').replace(r"\'", "'")
2326
2329
 
 
2330
                if adding and rhs != "":
 
2331
                    orig_rhs = raw.get(lhs)
 
2332
                    if orig_rhs is not None:
 
2333
                        rhs = orig_rhs + " " + rhs
 
2334
 
2327
2335
                raw[lhs] = rhs
2328
2336
 
2329
2337
        line = f.readline()