diff --git a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/api/QtInfoProvider.java b/cnd.discovery/src/org/netbeans/modules/cnd/discovery/api/QtInfoProvider.java --- a/cnd.discovery/src/org/netbeans/modules/cnd/discovery/api/QtInfoProvider.java +++ b/cnd.discovery/src/org/netbeans/modules/cnd/discovery/api/QtInfoProvider.java @@ -109,7 +109,7 @@ FileObject projectDir = conf.getBaseFSPath().getFileObject(); if (projectDir != null && projectDir.isValid()) { try { - FileObject qtMakeFile = RemoteFileUtil.getFileObject(projectDir, MakeConfiguration.NBPROJECT_FOLDER + "/qt-" + conf.getName() + ".mk"); //NOI18N + 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()) { @@ -221,6 +221,14 @@ 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 diff --git a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/Bundle.properties b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/Bundle.properties --- a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/Bundle.properties +++ b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/Bundle.properties @@ -339,6 +339,8 @@ QtPhononHint=Phonon Multimedia Framework (since Qt 4.4) Qt3SupportTxt=Qt3Support Qt3SupportHint=Qt3Support module +QtPrintSupportTxt=QtPrintSupport +QtPrintSupportHint=QtPrintSupport module QtSqlTxt=QtSql QtSqlHint=QtSql module QtSvgTxt=QtSvg diff --git a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/QmakeConfiguration.java b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/QmakeConfiguration.java --- a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/QmakeConfiguration.java +++ b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/api/configurations/QmakeConfiguration.java @@ -70,6 +70,7 @@ 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 @@ -90,6 +91,7 @@ private BooleanConfiguration openglEnabled; private BooleanConfiguration phononEnabled; private BooleanConfiguration qt3SupportEnabled; + private BooleanConfiguration printSupportEnabled; private BooleanConfiguration sqlEnabled; private BooleanConfiguration svgEnabled; private BooleanConfiguration webkitEnabled; @@ -117,6 +119,7 @@ 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); @@ -152,6 +155,7 @@ 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 @@ -280,6 +284,9 @@ if (isQt3SupportEnabled().getValue()) { append(buf, QT3SUPPORT); } + if (isPrintSupportEnabled().getValue()) { + append(buf, PRINTSUPPORT); + } if (isSqlEnabled().getValue()) { append(buf, SQL); } @@ -303,6 +310,7 @@ isOpenglEnabled().setValue(false); isPhononEnabled().setValue(false); isQt3SupportEnabled().setValue(false); + isPrintSupportEnabled().setValue(false); isSqlEnabled().setValue(false); isSvgEnabled().setValue(false); isXmlEnabled().setValue(false); @@ -324,6 +332,8 @@ 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)) { @@ -393,6 +403,13 @@ 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; @@ -478,6 +495,7 @@ 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()); @@ -503,6 +521,7 @@ 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()); diff --git a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/configurations/ConfigurationMakefileWriter.java b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/configurations/ConfigurationMakefileWriter.java --- a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/configurations/ConfigurationMakefileWriter.java +++ b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/configurations/ConfigurationMakefileWriter.java @@ -604,6 +604,7 @@ // It is important to generate makefile in current directory, and then move it to nbproject/. // Otherwise qmake will complain that sources are not found. bw.write("\t${QMAKE} VPATH=. " + qmakeSpec + "-o qttmp-"+MakeConfiguration.CND_CONF_MACRO+".mk nbproject/qt-"+MakeConfiguration.CND_CONF_MACRO+".pro\n"); // NOI18N + bw.write("\t-cp -f qttmp-"+MakeConfiguration.CND_CONF_MACRO+".mk nbproject/qt-"+MakeConfiguration.CND_CONF_MACRO+".nb\n"); // NOI18N bw.write("\tmv -f qttmp-"+MakeConfiguration.CND_CONF_MACRO+".mk nbproject/qt-"+MakeConfiguration.CND_CONF_MACRO+".mk\n"); // NOI18N // Removed paths tweak for Windows as when -spec is used everything works....