Skip to content

Commit

Permalink
Minor tweaks
Browse files Browse the repository at this point in the history 
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@2879 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Henrik Eriksson committed Sep 5, 2007
1 parent b38323a commit 6a034ad
Show file tree
Hide file tree
Showing 8 changed files with 249 additions and 48 deletions.
2 changes: 1 addition & 1 deletion OMNotebook/OMNotebookQT4/celldocument.cpp
View file
Expand Up @@ -173,7 +173,7 @@ namespace IAEX
}


open_ = true; // 2005-09-26 AF, not sure if this should be here
// open_ = true; // 2005-09-26 AF, not sure if this should be here //070903 HE, probably not
}

/*!
Expand Down
8 changes: 8 additions & 0 deletions OMNotebook/OMNotebookQT4/graphcell.cpp
View file
Expand Up @@ -379,6 +379,8 @@ namespace IAEX
createCompoundWidget();


connect(compoundwidget->gwMain, SIGNAL(newExpr(QString)), this, SLOT(setExpr(QString)));
connect(this, SIGNAL(newExpr(QString)), compoundwidget->gwMain, SLOT(setExpr(QString)));
}

/*!
Expand Down Expand Up @@ -1211,6 +1213,11 @@ namespace IAEX
}
}

void GraphCell::setExpr(QString expr)
{
input_->setPlainText(expr);
}

/*!
* \author Ingemar Axelsson and Anders Fernström
* \date 2006-04-18 (update)
Expand Down Expand Up @@ -1243,6 +1250,7 @@ namespace IAEX
QString expr = input_->toPlainText();
//expr = expr.simplified();

emit newExpr(expr);

QString openmodelica( getenv( "OPENMODELICAHOME" ) );
if( openmodelica.isEmpty() )
Expand Down
2 changes: 2 additions & 0 deletions OMNotebook/OMNotebookQT4/graphcell.h
View file
Expand Up @@ -113,6 +113,7 @@ namespace IAEX
void textChanged( bool );
void clickedOutput( Cell* ); // Added 2006-02-03 AF
void forwardAction( int ); // Added 2006-04-27 AF
void newExpr(QString);

public slots:
void eval();
Expand All @@ -136,6 +137,7 @@ namespace IAEX
void setClosed(const bool closed, bool update = true); //Changed 2006-08-24
virtual void setFocus(const bool focus);
virtual void setFocusOutput(const bool focus); // Added 2006-02-03 AF
void setExpr(QString);

void delegateFinished();

Expand Down
30 changes: 25 additions & 5 deletions OMNotebook/OMNotebookQT4/notebook.cpp
View file
Expand Up @@ -2311,11 +2311,26 @@ namespace IAEX
}
else
{
if(subject_->hasChanged())
{
int res = QMessageBox::question(this, QString("Save document?"), QString("The document has been modified. Do you want to save the changes?"), QMessageBox::Yes | QMessageBox::Default, QMessageBox::No, QMessageBox::Cancel);
if(res == QMessageBox::Yes)
{

save();
if(subject_->getFilename().isNull())
return;
}
else if(res == QMessageBox::Cancel)
return;
}

subject_ = new CellDocument(app_, QString::null);
subject_->executeCommand(new NewFileCommand());
subject_->attach(this);

update();
updateWindowTitle();
}
}

Expand Down Expand Up @@ -2375,10 +2390,15 @@ namespace IAEX
updateRecentFiles(filename_);





application()->commandCenter()->executeCommand(new OpenFileCommand(filename_));
if(subject_->isOpen())
application()->commandCenter()->executeCommand(new OpenFileCommand(filename_));
else
{
QMessageBox::information(0, "uuu", "ii");
subject_ = new CellDocument(app_, QString::null);
subject_->executeCommand(new OpenFileCommand(filename_));
subject_->attach(this);
}
}
else
{
Expand Down Expand Up @@ -2498,7 +2518,7 @@ namespace IAEX
QString version = OmcInteractiveEnvironment::OMCVersion();
QString abouttext = QString("OMNotebook version 2.0 (for OpenModelica ") + version +
QString(")\r\n") + QString("Copyright 2004-2006, PELAB, Linkoping University\r\n\r\n") +
QString("Created by Ingemar Axelsson (2004-2005) and Anders Fernström (2005-2006) as part of their final theses.");
QString("Created by Ingemar Axelsson (2004-2005), Anders Fernström (2005-2006) and Henrik Eriksson (2006-2007) as part of their final theses.");

QMessageBox::about( this, "OMNotebook", abouttext );
}
Expand Down
84 changes: 53 additions & 31 deletions OMNotebook/Pltpkg2/Pltpkg2.vcproj
View file
Expand Up @@ -20,7 +20,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="-Zm200 -EHsc"
Optimization="0"
AdditionalIncludeDirectories="c:\Qt\4.2.1-vc\include\QtCore,c:\Qt\4.2.1-vc\include\QtCore,c:\Qt\4.2.1-vc\include\QtGui,c:\Qt\4.2.1-vc\include\QtGui,c:\Qt\4.2.1-vc\include,.,c:\Qt\4.2.1-vc\include\ActiveQt,debug,.,..\..\..\..\Qt\4.2.1-vc\mkspecs\win32-msvc.net"
AdditionalIncludeDirectories="c:\Qt\4.3.1-vc\include\QtCore,c:\Qt\4.3.1-vc\include\QtCore,c:\Qt\4.3.1-vc\include\QtGui,c:\Qt\4.3.1-vc\include\QtGui,c:\Qt\4.3.1-vc\include,.,c:\Qt\4.3.1-vc\include\ActiveQt,debug,.,..\..\..\..\Qt\4.3.1-vc\mkspecs\win32-msvc.net"
PreprocessorDefinitions="_WINDOWS,UNICODE,QT_LARGEFILE_SUPPORT,WIN32,QT_DLL,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT"
GeneratePreprocessedFile="0"
MinimalRebuild="TRUE"
Expand Down Expand Up @@ -148,36 +148,36 @@
RelativePath="lineGroup.cpp">
</File>
<File
RelativePath="release\moc_compoundWidget.cpp">
RelativePath="debug\moc_compoundWidget.cpp">
<FileConfiguration
Name="Debug|Win32"
Name="Release|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File>
<File
RelativePath="debug\moc_compoundWidget.cpp">
RelativePath="release\moc_compoundWidget.cpp">
<FileConfiguration
Name="Release|Win32"
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File>
<File
RelativePath="debug\moc_graphWidget.cpp">
RelativePath="release\moc_graphWidget.cpp">
<FileConfiguration
Name="Release|Win32"
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File>
<File
RelativePath="release\moc_graphWidget.cpp">
RelativePath="debug\moc_graphWidget.cpp">
<FileConfiguration
Name="Debug|Win32"
Name="Release|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
Expand All @@ -201,8 +201,30 @@
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File>
<File
RelativePath=".\release\moc_legendLabel.cpp">
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)/$(InputName)1.obj"/>
</FileConfiguration>
</File>
<File
RelativePath=".\debug\moc_legendLabel.cpp">
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="TRUE">
<Tool
Name="VCCLCompilerTool"/>
</FileConfiguration>
</File>
<File
RelativePath=".\debug\moc_preferenceWindow.cpp">
Expand All @@ -227,19 +249,19 @@
<Tool
Name="VCCustomBuildTool"
Description="MOC compoundWidget.h"
CommandLine="c:\Qt\4.2.1-vc\bin\moc.exe -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include&quot; -I &quot;.&quot; -I &quot;C:\Qt\4.2.1-vc\include\ActiveQt&quot; -I &quot;debug&quot; -I &quot;.&quot; -I&quot;..\..\..\..\Qt\4.2.1-vc\mkspecs\win32-msvc.net&quot; compoundWidget.h -o debug\moc_compoundWidget.cpp
CommandLine="c:\Qt\4.3.1-vc\bin\moc.exe -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include&quot; -I &quot;.&quot; -I &quot;C:\Qt\4.2.1-vc\include\ActiveQt&quot; -I &quot;debug&quot; -I &quot;.&quot; -I&quot;..\..\..\..\Qt\4.2.1-vc\mkspecs\win32-msvc.net&quot; compoundWidget.h -o debug\moc_compoundWidget.cpp
"
AdditionalDependencies="c:\Qt\4.2.1-vc\bin\moc.exe"
AdditionalDependencies="c:\Qt\4.3.1-vc\bin\moc.exe"
Outputs="debug\moc_compoundWidget.cpp"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
Description="MOC compoundWidget.h"
CommandLine="c:\Qt\4.3-vc\bin\moc.exe -DNDEBUG -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include&quot; -I &quot;.&quot; -I &quot;C:\Qt\4.2.1-vc\include\ActiveQt&quot; -I &quot;release&quot; -I &quot;.&quot; -I&quot;..\..\..\..\Qt\4.2.1-vc\mkspecs\win32-msvc.net&quot; compoundWidget.h -o release\moc_compoundWidget.cpp
CommandLine="c:\Qt\4.3.1-vc\bin\moc.exe -DNDEBUG -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include&quot; -I &quot;.&quot; -I &quot;C:\Qt\4.2.1-vc\include\ActiveQt&quot; -I &quot;release&quot; -I &quot;.&quot; -I&quot;..\..\..\..\Qt\4.2.1-vc\mkspecs\win32-msvc.net&quot; compoundWidget.h -o release\moc_compoundWidget.cpp
"
AdditionalDependencies="c:\Qt\4.3-vc\bin\moc.exe"
AdditionalDependencies="c:\Qt\4.3.1-vc\bin\moc.exe"
Outputs="release\moc_compoundWidget.cpp"/>
</FileConfiguration>
</File>
Expand Down Expand Up @@ -267,9 +289,9 @@
<Tool
Name="VCCustomBuildTool"
Description="MOC graphWidget.h"
CommandLine="c:\Qt\4.2.1-vc\bin\moc.exe -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include&quot; -I &quot;.&quot; -I &quot;C:\Qt\4.2.1-vc\include\ActiveQt&quot; -I &quot;debug&quot; -I &quot;.&quot; -I&quot;..\..\..\..\Qt\4.2.1-vc\mkspecs\win32-msvc.net&quot; graphWidget.h -o debug\moc_graphWidget.cpp
CommandLine="c:\Qt\4.3.1-vc\bin\moc.exe -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include&quot; -I &quot;.&quot; -I &quot;C:\Qt\4.2.1-vc\include\ActiveQt&quot; -I &quot;debug&quot; -I &quot;.&quot; -I&quot;..\..\..\..\Qt\4.2.1-vc\mkspecs\win32-msvc.net&quot; graphWidget.h -o debug\moc_graphWidget.cpp
"
AdditionalDependencies="c:\Qt\4.2.1-vc\bin\moc.exe"
AdditionalDependencies="c:\Qt\4.3.1-vc\bin\moc.exe"
Outputs="debug\moc_graphWidget.cpp"/>
</FileConfiguration>
<FileConfiguration
Expand All @@ -290,9 +312,9 @@
<Tool
Name="VCCustomBuildTool"
Description="MOC graphWindow.h"
CommandLine="c:\Qt\4.2.1-vc\bin\moc.exe -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include&quot; -I &quot;.&quot; -I &quot;C:\Qt\4.2.1-vc\include\ActiveQt&quot; -I &quot;debug&quot; -I &quot;.&quot; -I&quot;..\..\..\..\Qt\4.2.1-vc\mkspecs\win32-msvc.net&quot; graphWindow.h -o debug\moc_graphWindow.cpp
CommandLine="c:\Qt\4.3.1-vc\bin\moc.exe -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include&quot; -I &quot;.&quot; -I &quot;C:\Qt\4.2.1-vc\include\ActiveQt&quot; -I &quot;debug&quot; -I &quot;.&quot; -I&quot;..\..\..\..\Qt\4.2.1-vc\mkspecs\win32-msvc.net&quot; graphWindow.h -o debug\moc_graphWindow.cpp
"
AdditionalDependencies="c:\Qt\4.2.1-vc\bin\moc.exe"
AdditionalDependencies="c:\Qt\4.3.1-vc\bin\moc.exe"
Outputs="debug\moc_graphWindow.cpp"/>
</FileConfiguration>
<FileConfiguration
Expand All @@ -312,18 +334,18 @@
Name="Debug|Win32">
<Tool
Name="VCCustomBuildTool"
CommandLine="c:\Qt\4.2.1-vc\bin\moc.exe -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include&quot; -I &quot;.&quot; -I &quot;C:\Qt\4.2.1-vc\include\ActiveQt&quot; -I &quot;debug&quot; -I &quot;.&quot; -I&quot;..\..\..\..\Qt\4.2.1-vc\mkspecs\win32-msvc.net&quot; legendLabel.h -o debug\moc_legendLabel.cpp
CommandLine="c:\Qt\4.3.1-vc\bin\moc.exe -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include&quot; -I &quot;.&quot; -I &quot;C:\Qt\4.2.1-vc\include\ActiveQt&quot; -I &quot;debug&quot; -I &quot;.&quot; -I&quot;..\..\..\..\Qt\4.2.1-vc\mkspecs\win32-msvc.net&quot; legendLabel.h -o debug\moc_legendLabel.cpp
"
AdditionalDependencies="c:\Qt\4.2.1-vc\bin\moc.exe"
AdditionalDependencies="c:\Qt\4.3.1-vc\bin\moc.exe"
Outputs="debug\moc_legendLabel.cpp"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCustomBuildTool"
CommandLine="c:\Qt\4.3-vc\bin\moc.exe -DNDEBUG -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include&quot; -I &quot;.&quot; -I &quot;C:\Qt\4.2.1-vc\include\ActiveQt&quot; -I &quot;release&quot; -I &quot;.&quot; -I&quot;..\..\..\..\Qt\4.2.1-vc\mkspecs\win32-msvc.net&quot; legendLabel.h -o release\moc_legendLabel.cpp
CommandLine="c:\Qt\4.3.1-vc\bin\moc.exe -DNDEBUG -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include&quot; -I &quot;.&quot; -I &quot;C:\Qt\4.2.1-vc\include\ActiveQt&quot; -I &quot;release&quot; -I &quot;.&quot; -I&quot;..\..\..\..\Qt\4.2.1-vc\mkspecs\win32-msvc.net&quot; legendLabel.h -o release\moc_legendLabel.cpp
"
AdditionalDependencies="c:\Qt\4.3-vc\bin\moc.exe"
AdditionalDependencies="c:\Qt\4.3.1-vc\bin\moc.exe"
Outputs="release\moc_legendLabel.cpp"/>
</FileConfiguration>
</File>
Expand All @@ -343,10 +365,10 @@
<Tool
Name="VCCustomBuildTool"
Description="MOC preferenceWindow.h"
CommandLine="c:\Qt\4.2.1-vc\bin\moc.exe -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include&quot; -I &quot;.&quot; -I &quot;C:\Qt\4.2.1-vc\include\ActiveQt&quot; -I &quot;debug&quot; -I &quot;.&quot; -I&quot;..\..\..\..\Qt\4.2.1-vc\mkspecs\win32-msvc.net&quot; preferenceWindow.h -o debug\moc_preferenceWindow.cpp
CommandLine="c:\Qt\4.3.1-vc\bin\moc.exe -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtCore&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include\QtGui&quot; -I &quot;C:\Qt\4.2.1-vc\include&quot; -I &quot;.&quot; -I &quot;C:\Qt\4.2.1-vc\include\ActiveQt&quot; -I &quot;debug&quot; -I &quot;.&quot; -I&quot;..\..\..\..\Qt\4.2.1-vc\mkspecs\win32-msvc.net&quot; preferenceWindow.h -o debug\moc_preferenceWindow.cpp
"
AdditionalDependencies="c:\Qt\4.2.1-vc\bin\moc.exe"
AdditionalDependencies="c:\Qt\4.3.1-vc\bin\moc.exe"
Outputs="debug\moc_preferenceWindow.cpp"/>
</FileConfiguration>
<FileConfiguration
Expand Down Expand Up @@ -377,9 +399,9 @@
<Tool
Name="VCCustomBuildTool"
Description="UIC compoundWidget.ui"
CommandLine="c:\Qt\4.2.1-vc\bin\uic.exe compoundWidget.ui -o ui_compoundWidget.h
CommandLine="c:\Qt\4.3.1-vc\bin\uic.exe compoundWidget.ui -o ui_compoundWidget.h
"
AdditionalDependencies="c:\Qt\4.2.1-vc\bin\uic.exe;graphWidget.h"
AdditionalDependencies="c:\Qt\4.3.1-vc\bin\uic.exe;graphWidget.h"
Outputs="ui_compoundWidget.h"/>
</FileConfiguration>
<FileConfiguration
Expand All @@ -400,9 +422,9 @@
<Tool
Name="VCCustomBuildTool"
Description="UIC dataSelect.ui"
CommandLine="c:\Qt\4.2.1-vc\bin\uic.exe dataSelect.ui -o ui_dataSelect.h
CommandLine="c:\Qt\4.3.1-vc\bin\uic.exe dataSelect.ui -o ui_dataSelect.h
"
AdditionalDependencies="c:\Qt\4.2.1-vc\bin\uic.exe"
AdditionalDependencies="c:\Qt\4.3.1-vc\bin\uic.exe"
Outputs="ui_dataSelect.h"/>
</FileConfiguration>
<FileConfiguration
Expand All @@ -423,9 +445,9 @@
<Tool
Name="VCCustomBuildTool"
Description="UIC graphWindow.ui"
CommandLine="c:\Qt\4.2.1-vc\bin\uic.exe graphWindow.ui -o ui_graphWindow.h
CommandLine="c:\Qt\4.3.1-vc\bin\uic.exe graphWindow.ui -o ui_graphWindow.h
"
AdditionalDependencies="c:\Qt\4.2.1-vc\bin\uic.exe;graphWidget.h"
AdditionalDependencies="c:\Qt\4.3.1-vc\bin\uic.exe;graphWidget.h"
Outputs="ui_graphWindow.h"/>
</FileConfiguration>
<FileConfiguration
Expand All @@ -446,9 +468,9 @@
<Tool
Name="VCCustomBuildTool"
Description="UIC preferences.ui"
CommandLine="c:\Qt\4.2.1-vc\bin\uic.exe preferences.ui -o ui_preferences.h
CommandLine="c:\Qt\4.3.1-vc\bin\uic.exe preferences.ui -o ui_preferences.h
"
AdditionalDependencies="c:\Qt\4.2.1-vc\bin\uic.exe"
AdditionalDependencies="c:\Qt\4.3.1-vc\bin\uic.exe"
Outputs="ui_preferences.h"/>
</FileConfiguration>
<FileConfiguration
Expand Down
2 changes: 1 addition & 1 deletion OMNotebook/Pltpkg2/focusRect.h
View file
Expand Up @@ -48,4 +48,4 @@ class FocusRect: public QGraphicsRectItem

};

#endif
#endif

0 comments on commit 6a034ad

Please sign in to comment.