| 1 | --- configure.py.orig 2006-03-24 19:09:08.000000000 -0500 |
|---|
| 2 | +++ configure.py 2006-04-19 06:05:07.000000000 -0400 |
|---|
| 3 | @@ -253,6 +253,7 @@ |
|---|
| 4 | 0x030200: "Qt_3_1_2", |
|---|
| 5 | 0x030300: "Qt_3_2_0", |
|---|
| 6 | 0x030305: "Qt_3_3_0", |
|---|
| 7 | + 0x030304: "Qt_3_3_4", |
|---|
| 8 | 0x030306: "Qt_3_3_5", |
|---|
| 9 | 0x040000: "Qt_3_3_6" |
|---|
| 10 | } |
|---|
| 11 | @@ -1026,9 +1027,9 @@ |
|---|
| 12 | """ |
|---|
| 13 | # Get the name of the qmake configuration file to take the macros from. |
|---|
| 14 | if "QMAKESPEC" in os.environ.keys(): |
|---|
| 15 | - fname = os.path.join(qt_dir, "mkspecs", os.environ["QMAKESPEC"], "qmake.conf") |
|---|
| 16 | + fname = "qmake.conf" |
|---|
| 17 | else: |
|---|
| 18 | - fname = os.path.join(qt_dir, "mkspecs", "default", "qmake.conf") |
|---|
| 19 | + fname = "qmake.conf" |
|---|
| 20 | |
|---|
| 21 | if not os.access(fname, os.F_OK): |
|---|
| 22 | sipconfig.error("Unable to find the default configuration file %s. You can use the QMAKESPEC environment variable to specify the correct platform instead of \"default\"." % fname) |
|---|
