← Back to branch summary

~ubuntu-branches/ubuntu/lucid/qt4-x11/lucid

« back to all changes in this revision

Viewing changes to tools/configure/configureapp.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi, Jonathan Riddell, Alessandro Ghersi
  • Date: 2010-02-25 02:23:43 UTC
  • mfrom: (1.1.29 upstream)
  • Revision ID: james.westby@ubuntu.com-20100225022343-qy63knnsv86fi6tc
Tags: 4:4.6.2-0ubuntu1
https://launchpad.net/bugs/515132
https://launchpad.net/bugs/517263
https://launchpad.net/bugs/527534
[ Jonathan Riddell ]
* New upstream release
* Update kubuntu_07_phonon_4.3.80.diff
* Update 05_append_qt4_target.diff

[ Alessandro Ghersi ]
* Update patches:
  - 0180-window-role.diff
  - 15_fix_qmake_makefile_generation.diff
  - 18_enable_qt3support_qtwebkit_debug_info.diff
  - 81_hurd_architecture.diff
  - 82_hurd_SA_SIGINFO.diff
  - 96_powerpc_no_gc_sections.diff
* Sync 92_armel_gcc43_valist_compat.diff with Debian
* Add kubuntu_11_fix_main_window_without_central_widget.diff (LP: #515132)
  (backport from Qt 4.6.3)
* In libqt4-dbg add conflicts with qt-x11-free-dbg (LP: #517263)
* qt4-dev-tools replaces libqt4-core (<= 4.5.3really4.5.2-0ubuntu1)
  (LP: #527534)
* Sync manpages/qdbus.1 with Debian
  - Update libqt4-dev.manpages
* qt4-dev-tools conflicts with qt3-dev-tools-embedded
* qt4-dev-tools suggests qt4-doc-html
* Update all symbol files
* Bump build dependency of debhelper and pkg-kde-tools to version 0.6.4 as it
  is needed to handle symbol files and build with pkgkde symbolshelper and
  parallel addon
* Call dh_auto_build instead of $(MAKE) for parallel build
* In override_dh_makeshlibs: do not FTBS if there are lost symbols
* Drop rules to generating libphonon4 symbols, no longer need

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/configure/configureapp.cpp
1
1
/****************************************************************************
2
2
**
3
 
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 
3
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
4
4
** All rights reserved.
5
5
** Contact: Nokia Corporation (qt-info@nokia.com)
6
6
**
317
317
    dictionary[ "OPENSSL" ]         = "auto";
318
318
    dictionary[ "DBUS" ]            = "auto";
319
319
    dictionary[ "S60" ]             = "yes";
 
320
    dictionary[ "SYMBIAN_DEFFILES" ] = "yes";
320
321
 
321
322
    dictionary[ "STYLE_WINDOWS" ]   = "yes";
322
323
    dictionary[ "STYLE_WINDOWSXP" ] = "auto";
482
483
            dictionary[ "BUILDNOKIA" ] = "yes";
483
484
            dictionary[ "BUILDDEV" ] = "yes";
484
485
            dictionary["LICENSE_CONFIRMED"] = "yes";
 
486
            if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) {
 
487
                dictionary[ "SYMBIAN_DEFFILES" ] = "no";
 
488
            }
485
489
        }
486
490
        else if( configCmdLine.at(i) == "-opensource" ) {
487
491
            dictionary[ "BUILDTYPE" ] = "opensource";
803
807
        else if( configCmdLine.at(i) == "-no-native-gestures" )
804
808
            dictionary[ "NATIVE_GESTURES" ] = "no";
805
809
#if !defined(EVAL)
806
 
        // Others ---------------------------------------------------
 
810
        // Symbian Support -------------------------------------------
807
811
        else if (configCmdLine.at(i) == "-fpu" )
808
812
        {
809
813
            ++i;
812
816
            dictionary[ "ARM_FPU_TYPE" ] = configCmdLine.at(i);
813
817
        }
814
818
 
815
 
        // S60 Support -------------------------------------------
816
819
        else if( configCmdLine.at(i) == "-s60" )
817
820
            dictionary[ "S60" ]    = "yes";
818
821
        else if( configCmdLine.at(i) == "-no-s60" )
819
822
            dictionary[ "S60" ]    = "no";
820
823
 
 
824
        else if( configCmdLine.at(i) == "-usedeffiles" )
 
825
            dictionary[ "SYMBIAN_DEFFILES" ] = "yes";
 
826
        else if( configCmdLine.at(i) == "-no-usedeffiles" )
 
827
            dictionary[ "SYMBIAN_DEFFILES" ] = "no";
 
828
 
 
829
        // Others ---------------------------------------------------
821
830
        else if (configCmdLine.at(i) == "-fast" )
822
831
            dictionary[ "FAST" ] = "yes";
823
832
        else if (configCmdLine.at(i) == "-no-fast" )
1822
1831
        desc("FREETYPE", "yes",    "-qt-freetype",         "Use the libfreetype bundled with Qt.");
1823
1832
        desc(                      "-fpu <flags>",         "VFP type on ARM, supported options: softvfp(default) | vfpv2 | softvfp+vfpv2");
1824
1833
        desc("S60", "no",          "-no-s60",              "Do not compile in S60 support.");
1825
 
        desc("S60", "yes",         "-s60",                 "Compile with support for the S60 UI Framework\n");
 
1834
        desc("S60", "yes",         "-s60",                 "Compile with support for the S60 UI Framework");
 
1835
        desc("SYMBIAN_DEFFILES", "no",  "-no-usedeffiles",  "Disable the usage of DEF files.");
 
1836
        desc("SYMBIAN_DEFFILES", "yes", "-usedeffiles",     "Enable the usage of DEF files.\n");
1826
1837
        return true;
1827
1838
    }
1828
1839
    return false;
2526
2537
            qtConfig += "phonon-backend";
2527
2538
    }
2528
2539
 
2529
 
    if (dictionary["MULTIMEDIA"] == "yes")
 
2540
    if (dictionary["MULTIMEDIA"] == "yes") {
2530
2541
        qtConfig += "multimedia";
 
2542
        if (dictionary["AUDIO_BACKEND"] == "yes")
 
2543
            qtConfig += "audio-backend";
 
2544
    }
2531
2545
 
2532
2546
    if (dictionary["WEBKIT"] == "yes")
2533
2547
        qtConfig += "webkit";
2744
2758
        if ( dictionary["PLUGIN_MANIFESTS"] == "no" )
2745
2759
            configStream << " no_plugin_manifest";
2746
2760
 
 
2761
        if ( dictionary.contains("SYMBIAN_DEFFILES") ) {
 
2762
            if(dictionary["SYMBIAN_DEFFILES"] == "yes" ) {
 
2763
                configStream << " def_files";
 
2764
            } else if ( dictionary["SYMBIAN_DEFFILES"] == "no" ) {
 
2765
                configStream << " def_files_disabled";
 
2766
            }
 
2767
        }
2747
2768
        configStream << endl;
2748
2769
        configStream << "QT_ARCH = " << dictionary[ "ARCHITECTURE" ] << endl;
2749
2770
        if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
2770
2791
        if (!dictionary["QT_LIBINFIX"].isEmpty())
2771
2792
            configStream << "QT_LIBINFIX = " << dictionary["QT_LIBINFIX"] << endl;
2772
2793
 
 
2794
        configStream << "#Qt for Symbian FPU settings" << endl;
2773
2795
        if(!dictionary["ARM_FPU_TYPE"].isEmpty()) {
2774
 
            configStream<<"QMAKE_CXXFLAGS.ARMCC += --fpu "<< dictionary["ARM_FPU_TYPE"];
 
2796
            configStream<<"MMP_RULES += \"ARMFPU "<< dictionary["ARM_FPU_TYPE"]<< "\"";
2775
2797
        }
2776
2798
 
2777
2799
        configStream.flush();
3267
3289
        cout << "Support for S60............." << dictionary[ "S60" ] << endl;
3268
3290
    }
3269
3291
 
 
3292
    if (dictionary.contains("SYMBIAN_DEFFILES")) {
 
3293
        cout << "Symbian DEF files enabled..." << dictionary[ "SYMBIAN_DEFFILES" ] << endl;
 
3294
        if(dictionary["SYMBIAN_DEFFILES"] == "no") {
 
3295
            cout << "WARNING: Disabling DEF files will mean that Qt is NOT binary compatible with previous versions." << endl;
 
3296
            cout << "         This feature is only intended for use during development, NEVER for release builds." << endl;
 
3297
        }
 
3298
    }
 
3299
 
3270
3300
    if(dictionary["ASSISTANT_WEBKIT"] == "yes")
3271
3301
        cout << "Using WebKit as html rendering engine in Qt Assistant." << endl;
3272
3302