480 cout << "Nokia employees and agents are allowed to use this software under" << endl; |
480 cout << "Nokia employees and agents are allowed to use this software under" << endl; |
481 cout << "the authority of Nokia Corporation and/or its subsidiary(-ies)" << endl; |
481 cout << "the authority of Nokia Corporation and/or its subsidiary(-ies)" << endl; |
482 dictionary[ "BUILDNOKIA" ] = "yes"; |
482 dictionary[ "BUILDNOKIA" ] = "yes"; |
483 dictionary[ "BUILDDEV" ] = "yes"; |
483 dictionary[ "BUILDDEV" ] = "yes"; |
484 dictionary["LICENSE_CONFIRMED"] = "yes"; |
484 dictionary["LICENSE_CONFIRMED"] = "yes"; |
|
485 dictionary[ "SYMBIAN_DEFFILES" ] = "no"; |
485 } |
486 } |
486 else if( configCmdLine.at(i) == "-opensource" ) { |
487 else if( configCmdLine.at(i) == "-opensource" ) { |
487 dictionary[ "BUILDTYPE" ] = "opensource"; |
488 dictionary[ "BUILDTYPE" ] = "opensource"; |
488 } |
489 } |
489 else if( configCmdLine.at(i) == "-commercial" ) { |
490 else if( configCmdLine.at(i) == "-commercial" ) { |
801 else if( configCmdLine.at(i) == "-native-gestures" ) |
802 else if( configCmdLine.at(i) == "-native-gestures" ) |
802 dictionary[ "NATIVE_GESTURES" ] = "yes"; |
803 dictionary[ "NATIVE_GESTURES" ] = "yes"; |
803 else if( configCmdLine.at(i) == "-no-native-gestures" ) |
804 else if( configCmdLine.at(i) == "-no-native-gestures" ) |
804 dictionary[ "NATIVE_GESTURES" ] = "no"; |
805 dictionary[ "NATIVE_GESTURES" ] = "no"; |
805 #if !defined(EVAL) |
806 #if !defined(EVAL) |
806 // Others --------------------------------------------------- |
807 // Symbian Support ------------------------------------------- |
807 else if (configCmdLine.at(i) == "-fpu" ) |
808 else if (configCmdLine.at(i) == "-fpu" ) |
808 { |
809 { |
809 ++i; |
810 ++i; |
810 if(i==argCount) |
811 if(i==argCount) |
811 break; |
812 break; |
812 dictionary[ "ARM_FPU_TYPE" ] = configCmdLine.at(i); |
813 dictionary[ "ARM_FPU_TYPE" ] = configCmdLine.at(i); |
813 } |
814 } |
814 |
815 |
815 // S60 Support ------------------------------------------- |
|
816 else if( configCmdLine.at(i) == "-s60" ) |
816 else if( configCmdLine.at(i) == "-s60" ) |
817 dictionary[ "S60" ] = "yes"; |
817 dictionary[ "S60" ] = "yes"; |
818 else if( configCmdLine.at(i) == "-no-s60" ) |
818 else if( configCmdLine.at(i) == "-no-s60" ) |
819 dictionary[ "S60" ] = "no"; |
819 dictionary[ "S60" ] = "no"; |
820 |
820 |
|
821 else if( configCmdLine.at(i) == "-usedeffiles" ) |
|
822 dictionary[ "SYMBIAN_DEFFILES" ] = "yes"; |
|
823 else if( configCmdLine.at(i) == "-no-usedeffiles" ) |
|
824 dictionary[ "SYMBIAN_DEFFILES" ] = "no"; |
|
825 |
|
826 // Others --------------------------------------------------- |
821 else if (configCmdLine.at(i) == "-fast" ) |
827 else if (configCmdLine.at(i) == "-fast" ) |
822 dictionary[ "FAST" ] = "yes"; |
828 dictionary[ "FAST" ] = "yes"; |
823 else if (configCmdLine.at(i) == "-no-fast" ) |
829 else if (configCmdLine.at(i) == "-no-fast" ) |
824 dictionary[ "FAST" ] = "no"; |
830 dictionary[ "FAST" ] = "no"; |
825 |
831 |
1469 dictionary[ "ASSISTANT_WEBKIT" ] = "no"; |
1475 dictionary[ "ASSISTANT_WEBKIT" ] = "no"; |
1470 dictionary[ "PHONON" ] = "yes"; |
1476 dictionary[ "PHONON" ] = "yes"; |
1471 dictionary[ "XMLPATTERNS" ] = "yes"; |
1477 dictionary[ "XMLPATTERNS" ] = "yes"; |
1472 dictionary[ "QT_GLIB" ] = "no"; |
1478 dictionary[ "QT_GLIB" ] = "no"; |
1473 dictionary[ "S60" ] = "yes"; |
1479 dictionary[ "S60" ] = "yes"; |
|
1480 dictionary[ "SYMBIAN_DEFFILES" ] = "yes"; |
1474 // iconv makes makes apps start and run ridiculously slowly in symbian emulator (HW not tested) |
1481 // iconv makes makes apps start and run ridiculously slowly in symbian emulator (HW not tested) |
1475 // iconv_open seems to return -1 always, so something is probably missing from the platform. |
1482 // iconv_open seems to return -1 always, so something is probably missing from the platform. |
1476 dictionary[ "QT_ICONV" ] = "no"; |
1483 dictionary[ "QT_ICONV" ] = "no"; |
1477 dictionary[ "SCRIPTTOOLS" ] = "no"; |
1484 dictionary[ "SCRIPTTOOLS" ] = "no"; |
1478 dictionary[ "QT_HOST_PREFIX" ] = dictionary[ "QT_INSTALL_PREFIX" ]; |
1485 dictionary[ "QT_HOST_PREFIX" ] = dictionary[ "QT_INSTALL_PREFIX" ]; |
1823 desc("Qt for Symbian OS only:\n\n"); |
1830 desc("Qt for Symbian OS only:\n\n"); |
1824 desc("FREETYPE", "no", "-no-freetype", "Do not compile in Freetype2 support."); |
1831 desc("FREETYPE", "no", "-no-freetype", "Do not compile in Freetype2 support."); |
1825 desc("FREETYPE", "yes", "-qt-freetype", "Use the libfreetype bundled with Qt."); |
1832 desc("FREETYPE", "yes", "-qt-freetype", "Use the libfreetype bundled with Qt."); |
1826 desc( "-fpu <flags>", "VFP type on ARM, supported options: softvfp(default) | vfpv2 | softvfp+vfpv2"); |
1833 desc( "-fpu <flags>", "VFP type on ARM, supported options: softvfp(default) | vfpv2 | softvfp+vfpv2"); |
1827 desc("S60", "no", "-no-s60", "Do not compile in S60 support."); |
1834 desc("S60", "no", "-no-s60", "Do not compile in S60 support."); |
1828 desc("S60", "yes", "-s60", "Compile with support for the S60 UI Framework\n"); |
1835 desc("S60", "yes", "-s60", "Compile with support for the S60 UI Framework"); |
|
1836 desc("SYMBIAN_DEFFILES", "no", "-no-usedeffiles", "Disable the usage of DEF files."); |
|
1837 desc("SYMBIAN_DEFFILES", "yes", "-usedeffiles", "Enable the usage of DEF files.\n"); |
1829 return true; |
1838 return true; |
1830 } |
1839 } |
1831 return false; |
1840 return false; |
1832 } |
1841 } |
1833 |
1842 |
2527 qtConfig += "phonon"; |
2536 qtConfig += "phonon"; |
2528 if (dictionary["PHONON_BACKEND"] == "yes") |
2537 if (dictionary["PHONON_BACKEND"] == "yes") |
2529 qtConfig += "phonon-backend"; |
2538 qtConfig += "phonon-backend"; |
2530 } |
2539 } |
2531 |
2540 |
2532 if (dictionary["MULTIMEDIA"] == "yes") |
2541 if (dictionary["MULTIMEDIA"] == "yes") { |
2533 qtConfig += "multimedia"; |
2542 qtConfig += "multimedia"; |
|
2543 if (dictionary["AUDIO_BACKEND"] == "yes") |
|
2544 qtConfig += "audio-backend"; |
|
2545 } |
2534 |
2546 |
2535 if (dictionary["WEBKIT"] == "yes") |
2547 if (dictionary["WEBKIT"] == "yes") |
2536 qtConfig += "webkit"; |
2548 qtConfig += "webkit"; |
2537 |
2549 |
2538 if (dictionary["DECLARATIVE"] == "yes") |
2550 if (dictionary["DECLARATIVE"] == "yes") |
2745 if ( dictionary["INCREDIBUILD_XGE"] == "yes" ) |
2757 if ( dictionary["INCREDIBUILD_XGE"] == "yes" ) |
2746 configStream << " incredibuild_xge"; |
2758 configStream << " incredibuild_xge"; |
2747 if ( dictionary["PLUGIN_MANIFESTS"] == "no" ) |
2759 if ( dictionary["PLUGIN_MANIFESTS"] == "no" ) |
2748 configStream << " no_plugin_manifest"; |
2760 configStream << " no_plugin_manifest"; |
2749 |
2761 |
|
2762 if ( dictionary.contains("SYMBIAN_DEFFILES") ) { |
|
2763 if(dictionary["SYMBIAN_DEFFILES"] == "yes" ) { |
|
2764 configStream << " def_files"; |
|
2765 } else if ( dictionary["SYMBIAN_DEFFILES"] == "no" ) { |
|
2766 configStream << " def_files_disabled"; |
|
2767 } |
|
2768 } |
2750 configStream << endl; |
2769 configStream << endl; |
2751 configStream << "QT_ARCH = " << dictionary[ "ARCHITECTURE" ] << endl; |
2770 configStream << "QT_ARCH = " << dictionary[ "ARCHITECTURE" ] << endl; |
2752 if (dictionary["QT_EDITION"].contains("OPENSOURCE")) |
2771 if (dictionary["QT_EDITION"].contains("OPENSOURCE")) |
2753 configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; |
2772 configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; |
2754 else |
2773 else |
3269 |
3288 |
3270 if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith(QLatin1String("symbian"))) { |
3289 if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith(QLatin1String("symbian"))) { |
3271 cout << "Support for S60............." << dictionary[ "S60" ] << endl; |
3290 cout << "Support for S60............." << dictionary[ "S60" ] << endl; |
3272 } |
3291 } |
3273 |
3292 |
|
3293 if (dictionary.contains("SYMBIAN_DEFFILES")) { |
|
3294 cout << "Symbian DEF files enabled..." << dictionary[ "SYMBIAN_DEFFILES" ] << endl; |
|
3295 if(dictionary["SYMBIAN_DEFFILES"] == "no") { |
|
3296 cout << "WARNING: Disabling DEF files will mean that Qt is NOT binary compatible with previous versions." << endl; |
|
3297 cout << " This feature is only intended for use during development, NEVER for release builds." << endl; |
|
3298 } |
|
3299 } |
|
3300 |
3274 if(dictionary["ASSISTANT_WEBKIT"] == "yes") |
3301 if(dictionary["ASSISTANT_WEBKIT"] == "yes") |
3275 cout << "Using WebKit as html rendering engine in Qt Assistant." << endl; |
3302 cout << "Using WebKit as html rendering engine in Qt Assistant." << endl; |
3276 |
3303 |
3277 if(checkAvailability("INCREDIBUILD_XGE")) |
3304 if(checkAvailability("INCREDIBUILD_XGE")) |
3278 cout << "Using IncrediBuild XGE......" << dictionary["INCREDIBUILD_XGE"] << endl; |
3305 cout << "Using IncrediBuild XGE......" << dictionary["INCREDIBUILD_XGE"] << endl; |