equal
deleted
inserted
replaced
967 } else if( configCmdLine.at(i) == "-qtlibinfix" ) { |
967 } else if( configCmdLine.at(i) == "-qtlibinfix" ) { |
968 ++i; |
968 ++i; |
969 if(i==argCount) |
969 if(i==argCount) |
970 break; |
970 break; |
971 dictionary[ "QT_LIBINFIX" ] = configCmdLine.at(i); |
971 dictionary[ "QT_LIBINFIX" ] = configCmdLine.at(i); |
|
972 if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) { |
|
973 dictionary[ "QT_INSTALL_PLUGINS" ] = |
|
974 QString("\\resource\\qt%1\\plugins").arg(dictionary[ "QT_LIBINFIX" ]); |
|
975 } |
972 } else if( configCmdLine.at(i) == "-D" ) { |
976 } else if( configCmdLine.at(i) == "-D" ) { |
973 ++i; |
977 ++i; |
974 if (i==argCount) |
978 if (i==argCount) |
975 break; |
979 break; |
976 qmakeDefines += configCmdLine.at(i); |
980 qmakeDefines += configCmdLine.at(i); |
1485 dictionary[ "QT_ICONV" ] = "no"; |
1489 dictionary[ "QT_ICONV" ] = "no"; |
1486 dictionary[ "SCRIPTTOOLS" ] = "no"; |
1490 dictionary[ "SCRIPTTOOLS" ] = "no"; |
1487 dictionary[ "QT_HOST_PREFIX" ] = dictionary[ "QT_INSTALL_PREFIX" ]; |
1491 dictionary[ "QT_HOST_PREFIX" ] = dictionary[ "QT_INSTALL_PREFIX" ]; |
1488 dictionary[ "QT_INSTALL_PREFIX" ] = ""; |
1492 dictionary[ "QT_INSTALL_PREFIX" ] = ""; |
1489 dictionary[ "QT_INSTALL_PLUGINS" ] = "\\resource\\qt\\plugins"; |
1493 dictionary[ "QT_INSTALL_PLUGINS" ] = "\\resource\\qt\\plugins"; |
|
1494 dictionary[ "QT_INSTALL_TRANSLATIONS" ] = "\\resource\\qt\\translations"; |
1490 dictionary[ "ARM_FPU_TYPE" ] = "softvfp"; |
1495 dictionary[ "ARM_FPU_TYPE" ] = "softvfp"; |
1491 dictionary[ "SQL_SQLITE" ] = "yes"; |
1496 dictionary[ "SQL_SQLITE" ] = "yes"; |
1492 dictionary[ "SQL_SQLITE_LIB" ] = "system"; |
1497 dictionary[ "SQL_SQLITE_LIB" ] = "system"; |
1493 |
1498 |
1494 // Disable building docs and translations for now |
1499 // Disable building docs and translations for now |
3023 qconfigList += "QT_NO_CONCURRENT"; |
3028 qconfigList += "QT_NO_CONCURRENT"; |
3024 qconfigList += "QT_NO_QFUTURE"; |
3029 qconfigList += "QT_NO_QFUTURE"; |
3025 qconfigList += "QT_NO_CRASHHANDLER"; |
3030 qconfigList += "QT_NO_CRASHHANDLER"; |
3026 qconfigList += "QT_NO_PRINTER"; |
3031 qconfigList += "QT_NO_PRINTER"; |
3027 qconfigList += "QT_NO_SYSTEMTRAYICON"; |
3032 qconfigList += "QT_NO_SYSTEMTRAYICON"; |
|
3033 if (dictionary.contains("QT_LIBINFIX")) |
|
3034 tmpStream << QString("#define QT_LIBINFIX \"%1\"").arg(dictionary["QT_LIBINFIX"]) << endl; |
3028 } |
3035 } |
3029 |
3036 |
3030 qconfigList.sort(); |
3037 qconfigList.sort(); |
3031 for (int i = 0; i < qconfigList.count(); ++i) |
3038 for (int i = 0; i < qconfigList.count(); ++i) |
3032 tmpStream << addDefine(qconfigList.at(i)); |
3039 tmpStream << addDefine(qconfigList.at(i)); |
3701 continue; |
3708 continue; |
3702 } |
3709 } |
3703 QTextStream txt(&file); |
3710 QTextStream txt(&file); |
3704 txt << "all:\n"; |
3711 txt << "all:\n"; |
3705 txt << "\t" << args.join(" ") << "\n"; |
3712 txt << "\t" << args.join(" ") << "\n"; |
3706 txt << "\t" << dictionary[ "MAKE" ] << " -f " << it->target << "\n"; |
3713 txt << "\t\"$(MAKE)\" -$(MAKEFLAGS) -f " << it->target << "\n"; |
3707 txt << "first: all\n"; |
3714 txt << "first: all\n"; |
3708 txt << "qmake:\n"; |
3715 txt << "qmake:\n"; |
3709 txt << "\t" << args.join(" ") << "\n"; |
3716 txt << "\t" << args.join(" ") << "\n"; |
3710 } |
3717 } |
3711 } |
3718 } |