Attachment #141571 for bug #237355

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 237355
Collapse All | Expand All




            FileObject projectDir = conf.getBaseFSPath().getFileObject();
            if (projectDir != null && projectDir.isValid()) {
                try {
                    FileObject qtMakeFile = RemoteFileUtil.getFileObject(projectDir, MakeConfiguration.NBPROJECT_FOLDER + "/qt-" + conf.getName() + ".nb"); //NOI18N
                    Project project = ProjectManager.getDefault().findProject(projectDir);
                    if (project != null && qtMakeFile != null && qtMakeFile.isValid()) {
                        for (String str : qtMakeFile.asLines()) {

                        result.add(baseDir.first() + File.separator + "Qt3Support"); // NOI18N
                    }
                }
                if (qmakeConfiguration.isPrintSupportEnabled().getValue()) {
                    if (baseDir.second() != null) {
                        result.add(baseDir.second() + File.separator + "QtPrintSupport.framework/Headers"); // NOI18N
                    }
                    if (baseDir.first() != null) {
                        result.add(baseDir.first() + File.separator + "QtPrintSupport"); // NOI18N
                    }
                }
                if (qmakeConfiguration.isSqlEnabled().getValue()) {
                    if (baseDir.second() != null) {
                        result.add(baseDir.second() + File.separator + "QtSql.framework/Headers"); // NOI18N

Lines 339-344 Link Here

(-)a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/Bundle.properties (+2 lines)
339	QtPhononHint=Phonon Multimedia Framework (since Qt 4.4)	339	QtPhononHint=Phonon Multimedia Framework (since Qt 4.4)
340	Qt3SupportTxt=Qt3Support	340	Qt3SupportTxt=Qt3Support
341	Qt3SupportHint=Qt3Support module	341	Qt3SupportHint=Qt3Support module
		342	QtPrintSupportTxt=QtPrintSupport
		343	QtPrintSupportHint=QtPrintSupport module
342	QtSqlTxt=QtSql	344	QtSqlTxt=QtSql
343	QtSqlHint=QtSql module	345	QtSqlHint=QtSql module
344	QtSvgTxt=QtSvg	346	QtSvgTxt=QtSvg




    private static final String OPENGL = "opengl"; // NOI18N
    private static final String PHONON = "phonon"; // NOI18N
    private static final String QT3SUPPORT = "qt3support"; // NOI18N
    private static final String PRINTSUPPORT = "printsupport"; // NOI18N
    private static final String SQL = "sql"; // NOI18N
    private static final String SVG = "svg"; // NOI18N
    private static final String WEBKIT = "webkit"; // NOI18N

    private BooleanConfiguration openglEnabled;
    private BooleanConfiguration phononEnabled;
    private BooleanConfiguration qt3SupportEnabled;
    private BooleanConfiguration printSupportEnabled;
    private BooleanConfiguration sqlEnabled;
    private BooleanConfiguration svgEnabled;
    private BooleanConfiguration webkitEnabled;

        openglEnabled = new BooleanConfiguration(false);
        phononEnabled = new BooleanConfiguration(false);
        qt3SupportEnabled = new BooleanConfiguration(false);
        printSupportEnabled = new BooleanConfiguration(false);
        sqlEnabled = new BooleanConfiguration(false);
        svgEnabled = new BooleanConfiguration(false);
        xmlEnabled = new BooleanConfiguration(false);

        modules.put(new BooleanNodeProp(openglEnabled, true, "QtOpengl", getString("QtOpenglTxt"), getString("QtOpenglHint"))); // NOI18N
        modules.put(new BooleanNodeProp(phononEnabled, true, "QtPhonon", getString("QtPhononTxt"), getString("QtPhononHint"))); // NOI18N
        modules.put(new BooleanNodeProp(qt3SupportEnabled, true, "Qt3Support", getString("Qt3SupportTxt"), getString("Qt3SupportHint"))); // NOI18N
        modules.put(new BooleanNodeProp(printSupportEnabled, true, "QtPrintSupport", getString("QtPrintSupportTxt"), getString("QtPrintSupportHint"))); // NOI18N
        modules.put(new BooleanNodeProp(sqlEnabled, true, "QtSql", getString("QtSqlTxt"), getString("QtSqlHint"))); // NOI18N
        modules.put(new BooleanNodeProp(svgEnabled, true, "QtSvg", getString("QtSvgTxt"), getString("QtSvgHint"))); // NOI18N
        modules.put(new BooleanNodeProp(xmlEnabled, true, "QtXml", getString("QtXmlTxt"), getString("QtXmlHint"))); // NOI18N

        if (isQt3SupportEnabled().getValue()) {
            append(buf, QT3SUPPORT);
        }
        if (isPrintSupportEnabled().getValue()) {
            append(buf, PRINTSUPPORT);
        }
        if (isSqlEnabled().getValue()) {
            append(buf, SQL);
        }

        isOpenglEnabled().setValue(false);
        isPhononEnabled().setValue(false);
        isQt3SupportEnabled().setValue(false);
        isPrintSupportEnabled().setValue(false);
        isSqlEnabled().setValue(false);
        isSvgEnabled().setValue(false);
        isXmlEnabled().setValue(false);

                isPhononEnabled().setValue(true);
            } else if (t.equals(QT3SUPPORT)) {
                isQt3SupportEnabled().setValue(true);
            } else if (t.equals(PRINTSUPPORT)) {
                isPrintSupportEnabled().setValue(true);
            } else if (t.equals(SQL)) {
                isSqlEnabled().setValue(true);
            } else if (t.equals(SVG)) {

    private void setQt3SupportEnabled(BooleanConfiguration val) {
        this.qt3SupportEnabled = val;
    }
    public BooleanConfiguration isPrintSupportEnabled() {
        return printSupportEnabled;
    }

    private void setPrintSupportEnabled(BooleanConfiguration val) {
        this.printSupportEnabled = val;
    }

    public BooleanConfiguration isSqlEnabled() {
        return sqlEnabled;

        isOpenglEnabled().assign(other.isOpenglEnabled());
        isPhononEnabled().assign(other.isPhononEnabled());
        isQt3SupportEnabled().assign(other.isQt3SupportEnabled());
        isPrintSupportEnabled().assign(other.isPrintSupportEnabled());
        isSqlEnabled().assign(other.isSqlEnabled());
        isSvgEnabled().assign(other.isSvgEnabled());
        isXmlEnabled().assign(other.isXmlEnabled());

            clone.setNetworkEnabled(isNetworkEnabled().clone());
            clone.setOpenglEnabled(isOpenglEnabled().clone());
            clone.setPhononEnabled(isPhononEnabled().clone());
            clone.setPrintSupportEnabled(isPrintSupportEnabled().clone());
            clone.setQt3SupportEnabled(isQt3SupportEnabled().clone());
            clone.setSqlEnabled(isSqlEnabled().clone());
            clone.setSvgEnabled(isSvgEnabled().clone());

Lines 604-609 Link Here

(-)a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/configurations/ConfigurationMakefileWriter.java (+1 lines)
604	// It is important to generate makefile in current directory, and then move it to nbproject/.	604	// It is important to generate makefile in current directory, and then move it to nbproject/.
605	// Otherwise qmake will complain that sources are not found.	605	// Otherwise qmake will complain that sources are not found.
606	bw.write("\t${QMAKE} VPATH=. " + qmakeSpec + "-o qttmp-"+MakeConfiguration.CND_CONF_MACRO+".mk nbproject/qt-"+MakeConfiguration.CND_CONF_MACRO+".pro\n"); // NOI18N	606	bw.write("\t${QMAKE} VPATH=. " + qmakeSpec + "-o qttmp-"+MakeConfiguration.CND_CONF_MACRO+".mk nbproject/qt-"+MakeConfiguration.CND_CONF_MACRO+".pro\n"); // NOI18N
		607	bw.write("\t-cp -f qttmp-"+MakeConfiguration.CND_CONF_MACRO+".mk nbproject/qt-"+MakeConfiguration.CND_CONF_MACRO+".nb\n"); // NOI18N
607	bw.write("\tmv -f qttmp-"+MakeConfiguration.CND_CONF_MACRO+".mk nbproject/qt-"+MakeConfiguration.CND_CONF_MACRO+".mk\n"); // NOI18N	608	bw.write("\tmv -f qttmp-"+MakeConfiguration.CND_CONF_MACRO+".mk nbproject/qt-"+MakeConfiguration.CND_CONF_MACRO+".mk\n"); // NOI18N
608		609
609	// Removed paths tweak for Windows as when -spec is used everything works....	610	// Removed paths tweak for Windows as when -spec is used everything works....

Return to bug 237355

Lines 109-115 Link Here

(-)a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/api/QtInfoProvider.java (-1 / +9 lines)
109	FileObject projectDir = conf.getBaseFSPath().getFileObject();	109	FileObject projectDir = conf.getBaseFSPath().getFileObject();
110	if (projectDir != null && projectDir.isValid()) {	110	if (projectDir != null && projectDir.isValid()) {
111	try {	111	try {
112	FileObject qtMakeFile = RemoteFileUtil.getFileObject(projectDir, MakeConfiguration.NBPROJECT_FOLDER + "/qt-" + conf.getName() + ".mk"); //NOI18N	112	FileObject qtMakeFile = RemoteFileUtil.getFileObject(projectDir, MakeConfiguration.NBPROJECT_FOLDER + "/qt-" + conf.getName() + ".nb"); //NOI18N
113	Project project = ProjectManager.getDefault().findProject(projectDir);	113	Project project = ProjectManager.getDefault().findProject(projectDir);
114	if (project != null && qtMakeFile != null && qtMakeFile.isValid()) {	114	if (project != null && qtMakeFile != null && qtMakeFile.isValid()) {
115	for (String str : qtMakeFile.asLines()) {	115	for (String str : qtMakeFile.asLines()) {
Lines 221-226 Link Here
221	result.add(baseDir.first() + File.separator + "Qt3Support"); // NOI18N	221	result.add(baseDir.first() + File.separator + "Qt3Support"); // NOI18N
222	}	222	}
223	}	223	}
		224	if (qmakeConfiguration.isPrintSupportEnabled().getValue()) {
		225	if (baseDir.second() != null) {
		226	result.add(baseDir.second() + File.separator + "QtPrintSupport.framework/Headers"); // NOI18N
		227	}
		228	if (baseDir.first() != null) {
		229	result.add(baseDir.first() + File.separator + "QtPrintSupport"); // NOI18N
		230	}
		231	}
224	if (qmakeConfiguration.isSqlEnabled().getValue()) {	232	if (qmakeConfiguration.isSqlEnabled().getValue()) {
225	if (baseDir.second() != null) {	233	if (baseDir.second() != null) {
226	result.add(baseDir.second() + File.separator + "QtSql.framework/Headers"); // NOI18N	234	result.add(baseDir.second() + File.separator + "QtSql.framework/Headers"); // NOI18N

Lines 70-75 Link Here

(-)a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/QmakeConfiguration.java (+19 lines)
70	private static final String OPENGL = "opengl"; // NOI18N	70	private static final String OPENGL = "opengl"; // NOI18N
71	private static final String PHONON = "phonon"; // NOI18N	71	private static final String PHONON = "phonon"; // NOI18N
72	private static final String QT3SUPPORT = "qt3support"; // NOI18N	72	private static final String QT3SUPPORT = "qt3support"; // NOI18N
		73	private static final String PRINTSUPPORT = "printsupport"; // NOI18N
73	private static final String SQL = "sql"; // NOI18N	74	private static final String SQL = "sql"; // NOI18N
74	private static final String SVG = "svg"; // NOI18N	75	private static final String SVG = "svg"; // NOI18N
75	private static final String WEBKIT = "webkit"; // NOI18N	76	private static final String WEBKIT = "webkit"; // NOI18N
Lines 90-95 Link Here
90	private BooleanConfiguration openglEnabled;	91	private BooleanConfiguration openglEnabled;
91	private BooleanConfiguration phononEnabled;	92	private BooleanConfiguration phononEnabled;
92	private BooleanConfiguration qt3SupportEnabled;	93	private BooleanConfiguration qt3SupportEnabled;
		94	private BooleanConfiguration printSupportEnabled;
93	private BooleanConfiguration sqlEnabled;	95	private BooleanConfiguration sqlEnabled;
94	private BooleanConfiguration svgEnabled;	96	private BooleanConfiguration svgEnabled;
95	private BooleanConfiguration webkitEnabled;	97	private BooleanConfiguration webkitEnabled;
Lines 117-122 Link Here
117	openglEnabled = new BooleanConfiguration(false);	119	openglEnabled = new BooleanConfiguration(false);
118	phononEnabled = new BooleanConfiguration(false);	120	phononEnabled = new BooleanConfiguration(false);
119	qt3SupportEnabled = new BooleanConfiguration(false);	121	qt3SupportEnabled = new BooleanConfiguration(false);
		122	printSupportEnabled = new BooleanConfiguration(false);
120	sqlEnabled = new BooleanConfiguration(false);	123	sqlEnabled = new BooleanConfiguration(false);
121	svgEnabled = new BooleanConfiguration(false);	124	svgEnabled = new BooleanConfiguration(false);
122	xmlEnabled = new BooleanConfiguration(false);	125	xmlEnabled = new BooleanConfiguration(false);
Lines 152-157 Link Here
152	modules.put(new BooleanNodeProp(openglEnabled, true, "QtOpengl", getString("QtOpenglTxt"), getString("QtOpenglHint"))); // NOI18N	155	modules.put(new BooleanNodeProp(openglEnabled, true, "QtOpengl", getString("QtOpenglTxt"), getString("QtOpenglHint"))); // NOI18N
153	modules.put(new BooleanNodeProp(phononEnabled, true, "QtPhonon", getString("QtPhononTxt"), getString("QtPhononHint"))); // NOI18N	156	modules.put(new BooleanNodeProp(phononEnabled, true, "QtPhonon", getString("QtPhononTxt"), getString("QtPhononHint"))); // NOI18N
154	modules.put(new BooleanNodeProp(qt3SupportEnabled, true, "Qt3Support", getString("Qt3SupportTxt"), getString("Qt3SupportHint"))); // NOI18N	157	modules.put(new BooleanNodeProp(qt3SupportEnabled, true, "Qt3Support", getString("Qt3SupportTxt"), getString("Qt3SupportHint"))); // NOI18N
		158	modules.put(new BooleanNodeProp(printSupportEnabled, true, "QtPrintSupport", getString("QtPrintSupportTxt"), getString("QtPrintSupportHint"))); // NOI18N
155	modules.put(new BooleanNodeProp(sqlEnabled, true, "QtSql", getString("QtSqlTxt"), getString("QtSqlHint"))); // NOI18N	159	modules.put(new BooleanNodeProp(sqlEnabled, true, "QtSql", getString("QtSqlTxt"), getString("QtSqlHint"))); // NOI18N
156	modules.put(new BooleanNodeProp(svgEnabled, true, "QtSvg", getString("QtSvgTxt"), getString("QtSvgHint"))); // NOI18N	160	modules.put(new BooleanNodeProp(svgEnabled, true, "QtSvg", getString("QtSvgTxt"), getString("QtSvgHint"))); // NOI18N
157	modules.put(new BooleanNodeProp(xmlEnabled, true, "QtXml", getString("QtXmlTxt"), getString("QtXmlHint"))); // NOI18N	161	modules.put(new BooleanNodeProp(xmlEnabled, true, "QtXml", getString("QtXmlTxt"), getString("QtXmlHint"))); // NOI18N
Lines 280-285 Link Here
280	if (isQt3SupportEnabled().getValue()) {	284	if (isQt3SupportEnabled().getValue()) {
281	append(buf, QT3SUPPORT);	285	append(buf, QT3SUPPORT);
282	}	286	}
		287	if (isPrintSupportEnabled().getValue()) {
		288	append(buf, PRINTSUPPORT);
		289	}
283	if (isSqlEnabled().getValue()) {	290	if (isSqlEnabled().getValue()) {
284	append(buf, SQL);	291	append(buf, SQL);
285	}	292	}
Lines 303-308 Link Here
303	isOpenglEnabled().setValue(false);	310	isOpenglEnabled().setValue(false);
304	isPhononEnabled().setValue(false);	311	isPhononEnabled().setValue(false);
305	isQt3SupportEnabled().setValue(false);	312	isQt3SupportEnabled().setValue(false);
		313	isPrintSupportEnabled().setValue(false);
306	isSqlEnabled().setValue(false);	314	isSqlEnabled().setValue(false);
307	isSvgEnabled().setValue(false);	315	isSvgEnabled().setValue(false);
308	isXmlEnabled().setValue(false);	316	isXmlEnabled().setValue(false);
Lines 324-329 Link Here
324	isPhononEnabled().setValue(true);	332	isPhononEnabled().setValue(true);
325	} else if (t.equals(QT3SUPPORT)) {	333	} else if (t.equals(QT3SUPPORT)) {
326	isQt3SupportEnabled().setValue(true);	334	isQt3SupportEnabled().setValue(true);
		335	} else if (t.equals(PRINTSUPPORT)) {
		336	isPrintSupportEnabled().setValue(true);
327	} else if (t.equals(SQL)) {	337	} else if (t.equals(SQL)) {
328	isSqlEnabled().setValue(true);	338	isSqlEnabled().setValue(true);
329	} else if (t.equals(SVG)) {	339	} else if (t.equals(SVG)) {
Lines 393-398 Link Here
393	private void setQt3SupportEnabled(BooleanConfiguration val) {	403	private void setQt3SupportEnabled(BooleanConfiguration val) {
394	this.qt3SupportEnabled = val;	404	this.qt3SupportEnabled = val;
395	}	405	}
		406	public BooleanConfiguration isPrintSupportEnabled() {
		407	return printSupportEnabled;
		408	}
		409
		410	private void setPrintSupportEnabled(BooleanConfiguration val) {
		411	this.printSupportEnabled = val;
		412	}
396		413
397	public BooleanConfiguration isSqlEnabled() {	414	public BooleanConfiguration isSqlEnabled() {
398	return sqlEnabled;	415	return sqlEnabled;
Lines 478-483 Link Here
478	isOpenglEnabled().assign(other.isOpenglEnabled());	495	isOpenglEnabled().assign(other.isOpenglEnabled());
479	isPhononEnabled().assign(other.isPhononEnabled());	496	isPhononEnabled().assign(other.isPhononEnabled());
480	isQt3SupportEnabled().assign(other.isQt3SupportEnabled());	497	isQt3SupportEnabled().assign(other.isQt3SupportEnabled());
		498	isPrintSupportEnabled().assign(other.isPrintSupportEnabled());
481	isSqlEnabled().assign(other.isSqlEnabled());	499	isSqlEnabled().assign(other.isSqlEnabled());
482	isSvgEnabled().assign(other.isSvgEnabled());	500	isSvgEnabled().assign(other.isSvgEnabled());
483	isXmlEnabled().assign(other.isXmlEnabled());	501	isXmlEnabled().assign(other.isXmlEnabled());
Lines 503-508 Link Here
503	clone.setNetworkEnabled(isNetworkEnabled().clone());	521	clone.setNetworkEnabled(isNetworkEnabled().clone());
504	clone.setOpenglEnabled(isOpenglEnabled().clone());	522	clone.setOpenglEnabled(isOpenglEnabled().clone());
505	clone.setPhononEnabled(isPhononEnabled().clone());	523	clone.setPhononEnabled(isPhononEnabled().clone());
		524	clone.setPrintSupportEnabled(isPrintSupportEnabled().clone());
506	clone.setQt3SupportEnabled(isQt3SupportEnabled().clone());	525	clone.setQt3SupportEnabled(isQt3SupportEnabled().clone());
507	clone.setSqlEnabled(isSqlEnabled().clone());	526	clone.setSqlEnabled(isSqlEnabled().clone());
508	clone.setSvgEnabled(isSvgEnabled().clone());	527	clone.setSvgEnabled(isSvgEnabled().clone());